From 383f20d339ed6cf55b2fcf714d2c8915a7e8db87 Mon Sep 17 00:00:00 2001 From: robertlipe Date: Sun, 13 Jan 2013 22:36:39 +0000 Subject: [PATCH] Start the C->C++ migration. Rename all interesting .c files to .cc. Tweak build system to cope with this. Some minor warning cleanups (mostly string constant chatter) but mtk_locus was the only source file that got any non-trivial edit in this process. (How? Because I've been chipping at the "C as C++" block for a long time and regularly compiling as both.) All tests that passed before still pass. --- gpsbabel/Makefile.in | 403 +++++++++--------- gpsbabel/{alan.c => alan.cc} | 0 gpsbabel/{an1.c => an1.cc} | 0 gpsbabel/{arcdist.c => arcdist.cc} | 0 gpsbabel/{avltree.c => avltree.cc} | 0 gpsbabel/{axim_gpb.c => axim_gpb.cc} | 0 gpsbabel/{bcr.c => bcr.cc} | 0 gpsbabel/{bend.c => bend.cc} | 0 gpsbabel/{brauniger_iq.c => brauniger_iq.cc} | 0 gpsbabel/{bushnell.c => bushnell.cc} | 0 gpsbabel/{bushnell_trl.c => bushnell_trl.cc} | 0 gpsbabel/{cet.c => cet.cc} | 0 gpsbabel/{cet_util.c => cet_util.cc} | 0 gpsbabel/{cetus.c => cetus.cc} | 0 gpsbabel/{coastexp.c => coastexp.cc} | 0 gpsbabel/{compegps.c => compegps.cc} | 0 gpsbabel/configure | 377 +++++++++++++++- gpsbabel/configure.in | 1 + gpsbabel/{copilot.c => copilot.cc} | 0 gpsbabel/{coto.c => coto.cc} | 0 gpsbabel/{cst.c => cst.cc} | 0 gpsbabel/{csv_util.c => csv_util.cc} | 6 +- gpsbabel/defs.h | 6 +- gpsbabel/{delbin.c => delbin.cc} | 0 gpsbabel/{delgpl.c => delgpl.cc} | 0 gpsbabel/{destinator.c => destinator.cc} | 0 gpsbabel/{dg-100.c => dg-100.cc} | 0 gpsbabel/{discard.c => discard.cc} | 0 gpsbabel/{dmtlog.c => dmtlog.cc} | 0 gpsbabel/{duplicate.c => duplicate.cc} | 0 gpsbabel/{easygps.c => easygps.cc} | 0 gpsbabel/{enigma.c => enigma.cc} | 0 gpsbabel/{exif.c => exif.cc} | 0 .../{explorist_ini.c => explorist_ini.cc} | 0 gpsbabel/{fatal.c => fatal.cc} | 0 .../{filter_skeleton.c => filter_skeleton.cc} | 0 gpsbabel/{filter_vecs.c => filter_vecs.cc} | 0 .../{format_skeleton.c => format_skeleton.cc} | 0 gpsbabel/{formspec.c => formspec.cc} | 0 gpsbabel/{g7towin.c => g7towin.cc} | 0 gpsbabel/{garmin.c => garmin.cc} | 0 ...rmin_device_xml.c => garmin_device_xml.cc} | 0 gpsbabel/{garmin_fit.c => garmin_fit.cc} | 0 gpsbabel/{garmin_fs.c => garmin_fs.cc} | 2 +- gpsbabel/{garmin_gpi.c => garmin_gpi.cc} | 0 .../{garmin_tables.c => garmin_tables.cc} | 6 +- gpsbabel/{garmin_txt.c => garmin_txt.cc} | 0 gpsbabel/{garmin_xt.c => garmin_xt.cc} | 0 gpsbabel/{gbfile.c => gbfile.cc} | 0 gpsbabel/{gbser.c => gbser.cc} | 0 gpsbabel/{gbser_posix.c => gbser_posix.cc} | 0 gpsbabel/{gbser_win.c => gbser_win.cc} | 0 gpsbabel/{gbsleep.c => gbsleep.cc} | 0 gpsbabel/{gcdb.c => gcdb.cc} | 0 gpsbabel/{gdb.c => gdb.cc} | 0 gpsbabel/{geo.c => geo.cc} | 0 gpsbabel/{geoniche.c => geoniche.cc} | 0 gpsbabel/{ggv_log.c => ggv_log.cc} | 0 gpsbabel/{ggv_ovl.c => ggv_ovl.cc} | 0 gpsbabel/{globals.c => globals.cc} | 0 gpsbabel/{glogbook.c => glogbook.cc} | 0 gpsbabel/{gnav_trl.c => gnav_trl.cc} | 0 gpsbabel/{google.c => google.cc} | 0 gpsbabel/{gopal.c => gopal.cc} | 0 gpsbabel/{gpilots.c => gpilots.cc} | 0 gpsbabel/{gpspilot.c => gpspilot.cc} | 0 gpsbabel/{gpssim.c => gpssim.cc} | 0 gpsbabel/{gpsutil.c => gpsutil.cc} | 0 gpsbabel/{gpx.c => gpx.cc} | 0 gpsbabel/{grtcirc.c => grtcirc.cc} | 0 gpsbabel/{gtm.c => gtm.cc} | 0 gpsbabel/{gtrnctr.c => gtrnctr.cc} | 0 gpsbabel/{height.c => height.cc} | 0 gpsbabel/{hiketech.c => hiketech.cc} | 0 gpsbabel/{holux.c => holux.cc} | 0 gpsbabel/{hsa_ndv.c => hsa_ndv.cc} | 0 gpsbabel/{html.c => html.cc} | 0 gpsbabel/{humminbird.c => humminbird.cc} | 0 gpsbabel/{igc.c => igc.cc} | 0 gpsbabel/{ignrando.c => ignrando.cc} | 0 gpsbabel/{igo8.c => igo8.cc} | 0 gpsbabel/{ik3d.c => ik3d.cc} | 0 gpsbabel/{inifile.c => inifile.cc} | 0 gpsbabel/{interpolate.c => interpolate.cc} | 0 gpsbabel/{itracku.c => itracku.cc} | 0 gpsbabel/jeeps/{gpsapp.c => gpsapp.cc} | 0 gpsbabel/jeeps/{gpscom.c => gpscom.cc} | 0 gpsbabel/jeeps/{gpsdevice.c => gpsdevice.cc} | 0 .../{gpsdevice_ser.c => gpsdevice_ser.cc} | 0 .../{gpsdevice_usb.c => gpsdevice_usb.cc} | 0 gpsbabel/jeeps/{gpsfmt.c => gpsfmt.cc} | 0 gpsbabel/jeeps/{gpsinput.c => gpsinput.cc} | 0 gpsbabel/jeeps/{gpslibusb.c => gpslibusb.cc} | 0 gpsbabel/jeeps/{gpsmath.c => gpsmath.cc} | 0 gpsbabel/jeeps/{gpsmem.c => gpsmem.cc} | 0 gpsbabel/jeeps/{gpsproj.c => gpsproj.cc} | 0 gpsbabel/jeeps/{gpsprot.c => gpsprot.cc} | 0 gpsbabel/jeeps/{gpsread.c => gpsread.cc} | 0 gpsbabel/jeeps/{gpsrqst.c => gpsrqst.cc} | 0 gpsbabel/jeeps/{gpssend.c => gpssend.cc} | 0 gpsbabel/jeeps/{gpsserial.c => gpsserial.cc} | 0 .../jeeps/{gpsusbcommon.c => gpsusbcommon.cc} | 0 .../jeeps/{gpsusbread.c => gpsusbread.cc} | 0 .../jeeps/{gpsusbsend.c => gpsusbsend.cc} | 0 .../jeeps/{gpsusbstub.c => gpsusbstub.cc} | 0 gpsbabel/jeeps/{gpsusbwin.c => gpsusbwin.cc} | 0 gpsbabel/jeeps/{gpsutil.c => gpsutil.cc} | 0 gpsbabel/jeeps/{main.c => main.cc} | 0 gpsbabel/{jogmap.c => jogmap.cc} | 0 gpsbabel/{jtr.c => jtr.cc} | 0 gpsbabel/{kml.c => kml.cc} | 18 +- gpsbabel/{lmx.c => lmx.cc} | 0 gpsbabel/{lowranceusr.c => lowranceusr.cc} | 0 gpsbabel/{lowranceusr4.c => lowranceusr4.cc} | 0 gpsbabel/{mag_pdb.c => mag_pdb.cc} | 0 gpsbabel/{maggeo.c => maggeo.cc} | 0 gpsbabel/{magnav.c => magnav.cc} | 0 gpsbabel/{magproto.c => magproto.cc} | 0 gpsbabel/{main.c => main.cc} | 0 gpsbabel/{mapasia.c => mapasia.cc} | 0 gpsbabel/{mapopolis.c => mapopolis.cc} | 0 gpsbabel/{mapsend.c => mapsend.cc} | 2 +- gpsbabel/{mapsource.c => mapsource.cc} | 0 gpsbabel/{mkicondoc.c => mkicondoc.cc} | 0 gpsbabel/{mkshort.c => mkshort.cc} | 0 gpsbabel/{mmo.c => mmo.cc} | 0 gpsbabel/{msroute.c => msroute.cc} | 0 gpsbabel/{mtk_locus.c => mtk_locus.cc} | 33 +- gpsbabel/{mtk_logger.c => mtk_logger.cc} | 0 gpsbabel/{navicache.c => navicache.cc} | 0 gpsbabel/{naviguide.c => naviguide.cc} | 0 gpsbabel/{navilink.c => navilink.cc} | 0 gpsbabel/{navitel.c => navitel.cc} | 0 gpsbabel/{netstumbler.c => netstumbler.cc} | 0 gpsbabel/{nmea.c => nmea.cc} | 0 gpsbabel/{nmn4.c => nmn4.cc} | 0 gpsbabel/{nukedata.c => nukedata.cc} | 0 gpsbabel/{osm.c => osm.cc} | 0 gpsbabel/{overlay.c => overlay.cc} | 6 +- gpsbabel/{ozi.c => ozi.cc} | 8 +- gpsbabel/{palmdoc.c => palmdoc.cc} | 0 gpsbabel/{parse.c => parse.cc} | 0 gpsbabel/{pathaway.c => pathaway.cc} | 0 gpsbabel/{pcx.c => pcx.cc} | 0 gpsbabel/{pdbfile.c => pdbfile.cc} | 0 gpsbabel/{pocketfms_bc.c => pocketfms_bc.cc} | 0 gpsbabel/{pocketfms_fp.c => pocketfms_fp.cc} | 0 gpsbabel/{pocketfms_wp.c => pocketfms_wp.cc} | 2 +- gpsbabel/{polygon.c => polygon.cc} | 0 gpsbabel/{position.c => position.cc} | 0 gpsbabel/{psitrex.c => psitrex.cc} | 0 gpsbabel/{psp.c => psp.cc} | 0 gpsbabel/{queue.c => queue.cc} | 0 gpsbabel/{quovadis.c => quovadis.cc} | 0 gpsbabel/{radius.c => radius.cc} | 0 gpsbabel/{random.c => random.cc} | 0 gpsbabel/{raymarine.c => raymarine.cc} | 0 .../{reverse_route.c => reverse_route.cc} | 0 gpsbabel/{rgbcolors.c => rgbcolors.cc} | 0 gpsbabel/{route.c => route.cc} | 0 gpsbabel/{saroute.c => saroute.cc} | 0 gpsbabel/{sbn.c => sbn.cc} | 0 gpsbabel/{sbp.c => sbp.cc} | 0 gpsbabel/{session.c => session.cc} | 0 gpsbabel/{shape.c => shape.cc} | 2 +- gpsbabel/{skyforce.c => skyforce.cc} | 0 gpsbabel/{skytraq.c => skytraq.cc} | 0 gpsbabel/{smplrout.c => smplrout.cc} | 0 gpsbabel/{sort.c => sort.cc} | 0 gpsbabel/{stackfilter.c => stackfilter.cc} | 0 gpsbabel/{stmsdf.c => stmsdf.cc} | 6 +- gpsbabel/{stmwpp.c => stmwpp.cc} | 0 gpsbabel/{subrip.c => subrip.cc} | 0 gpsbabel/{swapdata.c => swapdata.cc} | 0 gpsbabel/{tef_xml.c => tef_xml.cc} | 0 gpsbabel/{teletype.c => teletype.cc} | 0 gpsbabel/{text.c => text.cc} | 0 gpsbabel/{tiger.c => tiger.cc} | 0 gpsbabel/{tmpro.c => tmpro.cc} | 0 gpsbabel/{tomtom.c => tomtom.cc} | 0 gpsbabel/{tpg.c => tpg.cc} | 0 gpsbabel/{tpo.c => tpo.cc} | 0 gpsbabel/{trackfilter.c => trackfilter.cc} | 0 gpsbabel/{transform.c => transform.cc} | 0 gpsbabel/{unicsv.c => unicsv.cc} | 0 gpsbabel/{units.c => units.cc} | 6 +- gpsbabel/{util.c => util.cc} | 0 gpsbabel/{util_crc.c => util_crc.cc} | 0 gpsbabel/{uuid.c => uuid.cc} | 0 gpsbabel/{v900.c => v900.cc} | 0 gpsbabel/{vcf.c => vcf.cc} | 0 gpsbabel/{vecs.c => vecs.cc} | 2 +- gpsbabel/{vidaone.c => vidaone.cc} | 0 gpsbabel/{vitosmt.c => vitosmt.cc} | 0 gpsbabel/{vitovtt.c => vitovtt.cc} | 0 gpsbabel/{vmem.c => vmem.cc} | 0 gpsbabel/{vpl.c => vpl.cc} | 0 gpsbabel/{waypt.c => waypt.cc} | 0 gpsbabel/{wbt-200.c => wbt-200.cc} | 2 +- gpsbabel/{wfff_xml.c => wfff_xml.cc} | 0 gpsbabel/{wintec_tes.c => wintec_tes.cc} | 0 gpsbabel/{xcsv.c => xcsv.cc} | 0 gpsbabel/{xhtmlent.c => xhtmlent.cc} | 0 gpsbabel/{xmlgeneric.c => xmlgeneric.cc} | 0 gpsbabel/{xmltag.c => xmltag.cc} | 0 gpsbabel/{xol.c => xol.cc} | 0 gpsbabel/{yahoo.c => yahoo.cc} | 0 207 files changed, 634 insertions(+), 254 deletions(-) rename gpsbabel/{alan.c => alan.cc} (100%) rename gpsbabel/{an1.c => an1.cc} (100%) rename gpsbabel/{arcdist.c => arcdist.cc} (100%) rename gpsbabel/{avltree.c => avltree.cc} (100%) rename gpsbabel/{axim_gpb.c => axim_gpb.cc} (100%) rename gpsbabel/{bcr.c => bcr.cc} (100%) rename gpsbabel/{bend.c => bend.cc} (100%) rename gpsbabel/{brauniger_iq.c => brauniger_iq.cc} (100%) rename gpsbabel/{bushnell.c => bushnell.cc} (100%) rename gpsbabel/{bushnell_trl.c => bushnell_trl.cc} (100%) rename gpsbabel/{cet.c => cet.cc} (100%) rename gpsbabel/{cet_util.c => cet_util.cc} (100%) rename gpsbabel/{cetus.c => cetus.cc} (100%) rename gpsbabel/{coastexp.c => coastexp.cc} (100%) rename gpsbabel/{compegps.c => compegps.cc} (100%) rename gpsbabel/{copilot.c => copilot.cc} (100%) rename gpsbabel/{coto.c => coto.cc} (100%) rename gpsbabel/{cst.c => cst.cc} (100%) rename gpsbabel/{csv_util.c => csv_util.cc} (99%) rename gpsbabel/{delbin.c => delbin.cc} (100%) rename gpsbabel/{delgpl.c => delgpl.cc} (100%) rename gpsbabel/{destinator.c => destinator.cc} (100%) rename gpsbabel/{dg-100.c => dg-100.cc} (100%) rename gpsbabel/{discard.c => discard.cc} (100%) rename gpsbabel/{dmtlog.c => dmtlog.cc} (100%) rename gpsbabel/{duplicate.c => duplicate.cc} (100%) rename gpsbabel/{easygps.c => easygps.cc} (100%) rename gpsbabel/{enigma.c => enigma.cc} (100%) rename gpsbabel/{exif.c => exif.cc} (100%) rename gpsbabel/{explorist_ini.c => explorist_ini.cc} (100%) rename gpsbabel/{fatal.c => fatal.cc} (100%) rename gpsbabel/{filter_skeleton.c => filter_skeleton.cc} (100%) rename gpsbabel/{filter_vecs.c => filter_vecs.cc} (100%) rename gpsbabel/{format_skeleton.c => format_skeleton.cc} (100%) rename gpsbabel/{formspec.c => formspec.cc} (100%) rename gpsbabel/{g7towin.c => g7towin.cc} (100%) rename gpsbabel/{garmin.c => garmin.cc} (100%) rename gpsbabel/{garmin_device_xml.c => garmin_device_xml.cc} (100%) rename gpsbabel/{garmin_fit.c => garmin_fit.cc} (100%) rename gpsbabel/{garmin_fs.c => garmin_fs.cc} (99%) rename gpsbabel/{garmin_gpi.c => garmin_gpi.cc} (100%) rename gpsbabel/{garmin_tables.c => garmin_tables.cc} (99%) rename gpsbabel/{garmin_txt.c => garmin_txt.cc} (100%) rename gpsbabel/{garmin_xt.c => garmin_xt.cc} (100%) rename gpsbabel/{gbfile.c => gbfile.cc} (100%) rename gpsbabel/{gbser.c => gbser.cc} (100%) rename gpsbabel/{gbser_posix.c => gbser_posix.cc} (100%) rename gpsbabel/{gbser_win.c => gbser_win.cc} (100%) rename gpsbabel/{gbsleep.c => gbsleep.cc} (100%) rename gpsbabel/{gcdb.c => gcdb.cc} (100%) rename gpsbabel/{gdb.c => gdb.cc} (100%) rename gpsbabel/{geo.c => geo.cc} (100%) rename gpsbabel/{geoniche.c => geoniche.cc} (100%) rename gpsbabel/{ggv_log.c => ggv_log.cc} (100%) rename gpsbabel/{ggv_ovl.c => ggv_ovl.cc} (100%) rename gpsbabel/{globals.c => globals.cc} (100%) rename gpsbabel/{glogbook.c => glogbook.cc} (100%) rename gpsbabel/{gnav_trl.c => gnav_trl.cc} (100%) rename gpsbabel/{google.c => google.cc} (100%) rename gpsbabel/{gopal.c => gopal.cc} (100%) rename gpsbabel/{gpilots.c => gpilots.cc} (100%) rename gpsbabel/{gpspilot.c => gpspilot.cc} (100%) rename gpsbabel/{gpssim.c => gpssim.cc} (100%) rename gpsbabel/{gpsutil.c => gpsutil.cc} (100%) rename gpsbabel/{gpx.c => gpx.cc} (100%) rename gpsbabel/{grtcirc.c => grtcirc.cc} (100%) rename gpsbabel/{gtm.c => gtm.cc} (100%) rename gpsbabel/{gtrnctr.c => gtrnctr.cc} (100%) rename gpsbabel/{height.c => height.cc} (100%) rename gpsbabel/{hiketech.c => hiketech.cc} (100%) rename gpsbabel/{holux.c => holux.cc} (100%) rename gpsbabel/{hsa_ndv.c => hsa_ndv.cc} (100%) rename gpsbabel/{html.c => html.cc} (100%) rename gpsbabel/{humminbird.c => humminbird.cc} (100%) rename gpsbabel/{igc.c => igc.cc} (100%) rename gpsbabel/{ignrando.c => ignrando.cc} (100%) rename gpsbabel/{igo8.c => igo8.cc} (100%) rename gpsbabel/{ik3d.c => ik3d.cc} (100%) rename gpsbabel/{inifile.c => inifile.cc} (100%) rename gpsbabel/{interpolate.c => interpolate.cc} (100%) rename gpsbabel/{itracku.c => itracku.cc} (100%) rename gpsbabel/jeeps/{gpsapp.c => gpsapp.cc} (100%) rename gpsbabel/jeeps/{gpscom.c => gpscom.cc} (100%) rename gpsbabel/jeeps/{gpsdevice.c => gpsdevice.cc} (100%) rename gpsbabel/jeeps/{gpsdevice_ser.c => gpsdevice_ser.cc} (100%) rename gpsbabel/jeeps/{gpsdevice_usb.c => gpsdevice_usb.cc} (100%) rename gpsbabel/jeeps/{gpsfmt.c => gpsfmt.cc} (100%) rename gpsbabel/jeeps/{gpsinput.c => gpsinput.cc} (100%) rename gpsbabel/jeeps/{gpslibusb.c => gpslibusb.cc} (100%) rename gpsbabel/jeeps/{gpsmath.c => gpsmath.cc} (100%) rename gpsbabel/jeeps/{gpsmem.c => gpsmem.cc} (100%) rename gpsbabel/jeeps/{gpsproj.c => gpsproj.cc} (100%) rename gpsbabel/jeeps/{gpsprot.c => gpsprot.cc} (100%) rename gpsbabel/jeeps/{gpsread.c => gpsread.cc} (100%) rename gpsbabel/jeeps/{gpsrqst.c => gpsrqst.cc} (100%) rename gpsbabel/jeeps/{gpssend.c => gpssend.cc} (100%) rename gpsbabel/jeeps/{gpsserial.c => gpsserial.cc} (100%) rename gpsbabel/jeeps/{gpsusbcommon.c => gpsusbcommon.cc} (100%) rename gpsbabel/jeeps/{gpsusbread.c => gpsusbread.cc} (100%) rename gpsbabel/jeeps/{gpsusbsend.c => gpsusbsend.cc} (100%) rename gpsbabel/jeeps/{gpsusbstub.c => gpsusbstub.cc} (100%) rename gpsbabel/jeeps/{gpsusbwin.c => gpsusbwin.cc} (100%) rename gpsbabel/jeeps/{gpsutil.c => gpsutil.cc} (100%) rename gpsbabel/jeeps/{main.c => main.cc} (100%) rename gpsbabel/{jogmap.c => jogmap.cc} (100%) rename gpsbabel/{jtr.c => jtr.cc} (100%) rename gpsbabel/{kml.c => kml.cc} (99%) rename gpsbabel/{lmx.c => lmx.cc} (100%) rename gpsbabel/{lowranceusr.c => lowranceusr.cc} (100%) rename gpsbabel/{lowranceusr4.c => lowranceusr4.cc} (100%) rename gpsbabel/{mag_pdb.c => mag_pdb.cc} (100%) rename gpsbabel/{maggeo.c => maggeo.cc} (100%) rename gpsbabel/{magnav.c => magnav.cc} (100%) rename gpsbabel/{magproto.c => magproto.cc} (100%) rename gpsbabel/{main.c => main.cc} (100%) rename gpsbabel/{mapasia.c => mapasia.cc} (100%) rename gpsbabel/{mapopolis.c => mapopolis.cc} (100%) rename gpsbabel/{mapsend.c => mapsend.cc} (99%) rename gpsbabel/{mapsource.c => mapsource.cc} (100%) rename gpsbabel/{mkicondoc.c => mkicondoc.cc} (100%) rename gpsbabel/{mkshort.c => mkshort.cc} (100%) rename gpsbabel/{mmo.c => mmo.cc} (100%) rename gpsbabel/{msroute.c => msroute.cc} (100%) rename gpsbabel/{mtk_locus.c => mtk_locus.cc} (95%) rename gpsbabel/{mtk_logger.c => mtk_logger.cc} (100%) rename gpsbabel/{navicache.c => navicache.cc} (100%) rename gpsbabel/{naviguide.c => naviguide.cc} (100%) rename gpsbabel/{navilink.c => navilink.cc} (100%) rename gpsbabel/{navitel.c => navitel.cc} (100%) rename gpsbabel/{netstumbler.c => netstumbler.cc} (100%) rename gpsbabel/{nmea.c => nmea.cc} (100%) rename gpsbabel/{nmn4.c => nmn4.cc} (100%) rename gpsbabel/{nukedata.c => nukedata.cc} (100%) rename gpsbabel/{osm.c => osm.cc} (100%) rename gpsbabel/{overlay.c => overlay.cc} (99%) rename gpsbabel/{ozi.c => ozi.cc} (99%) rename gpsbabel/{palmdoc.c => palmdoc.cc} (100%) rename gpsbabel/{parse.c => parse.cc} (100%) rename gpsbabel/{pathaway.c => pathaway.cc} (100%) rename gpsbabel/{pcx.c => pcx.cc} (100%) rename gpsbabel/{pdbfile.c => pdbfile.cc} (100%) rename gpsbabel/{pocketfms_bc.c => pocketfms_bc.cc} (100%) rename gpsbabel/{pocketfms_fp.c => pocketfms_fp.cc} (100%) rename gpsbabel/{pocketfms_wp.c => pocketfms_wp.cc} (99%) rename gpsbabel/{polygon.c => polygon.cc} (100%) rename gpsbabel/{position.c => position.cc} (100%) rename gpsbabel/{psitrex.c => psitrex.cc} (100%) rename gpsbabel/{psp.c => psp.cc} (100%) rename gpsbabel/{queue.c => queue.cc} (100%) rename gpsbabel/{quovadis.c => quovadis.cc} (100%) rename gpsbabel/{radius.c => radius.cc} (100%) rename gpsbabel/{random.c => random.cc} (100%) rename gpsbabel/{raymarine.c => raymarine.cc} (100%) rename gpsbabel/{reverse_route.c => reverse_route.cc} (100%) rename gpsbabel/{rgbcolors.c => rgbcolors.cc} (100%) rename gpsbabel/{route.c => route.cc} (100%) rename gpsbabel/{saroute.c => saroute.cc} (100%) rename gpsbabel/{sbn.c => sbn.cc} (100%) rename gpsbabel/{sbp.c => sbp.cc} (100%) rename gpsbabel/{session.c => session.cc} (100%) rename gpsbabel/{shape.c => shape.cc} (99%) rename gpsbabel/{skyforce.c => skyforce.cc} (100%) rename gpsbabel/{skytraq.c => skytraq.cc} (100%) rename gpsbabel/{smplrout.c => smplrout.cc} (100%) rename gpsbabel/{sort.c => sort.cc} (100%) rename gpsbabel/{stackfilter.c => stackfilter.cc} (100%) rename gpsbabel/{stmsdf.c => stmsdf.cc} (99%) rename gpsbabel/{stmwpp.c => stmwpp.cc} (100%) rename gpsbabel/{subrip.c => subrip.cc} (100%) rename gpsbabel/{swapdata.c => swapdata.cc} (100%) rename gpsbabel/{tef_xml.c => tef_xml.cc} (100%) rename gpsbabel/{teletype.c => teletype.cc} (100%) rename gpsbabel/{text.c => text.cc} (100%) rename gpsbabel/{tiger.c => tiger.cc} (100%) rename gpsbabel/{tmpro.c => tmpro.cc} (100%) rename gpsbabel/{tomtom.c => tomtom.cc} (100%) rename gpsbabel/{tpg.c => tpg.cc} (100%) rename gpsbabel/{tpo.c => tpo.cc} (100%) rename gpsbabel/{trackfilter.c => trackfilter.cc} (100%) rename gpsbabel/{transform.c => transform.cc} (100%) rename gpsbabel/{unicsv.c => unicsv.cc} (100%) rename gpsbabel/{units.c => units.cc} (93%) rename gpsbabel/{util.c => util.cc} (100%) rename gpsbabel/{util_crc.c => util_crc.cc} (100%) rename gpsbabel/{uuid.c => uuid.cc} (100%) rename gpsbabel/{v900.c => v900.cc} (100%) rename gpsbabel/{vcf.c => vcf.cc} (100%) rename gpsbabel/{vecs.c => vecs.cc} (99%) rename gpsbabel/{vidaone.c => vidaone.cc} (100%) rename gpsbabel/{vitosmt.c => vitosmt.cc} (100%) rename gpsbabel/{vitovtt.c => vitovtt.cc} (100%) rename gpsbabel/{vmem.c => vmem.cc} (100%) rename gpsbabel/{vpl.c => vpl.cc} (100%) rename gpsbabel/{waypt.c => waypt.cc} (100%) rename gpsbabel/{wbt-200.c => wbt-200.cc} (99%) rename gpsbabel/{wfff_xml.c => wfff_xml.cc} (100%) rename gpsbabel/{wintec_tes.c => wintec_tes.cc} (100%) rename gpsbabel/{xcsv.c => xcsv.cc} (100%) rename gpsbabel/{xhtmlent.c => xhtmlent.cc} (100%) rename gpsbabel/{xmlgeneric.c => xmlgeneric.cc} (100%) rename gpsbabel/{xmltag.c => xmltag.cc} (100%) rename gpsbabel/{xol.c => xol.cc} (100%) rename gpsbabel/{yahoo.c => yahoo.cc} (100%) diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in index 266bb20c3..37b6c0743 100644 --- a/gpsbabel/Makefile.in +++ b/gpsbabel/Makefile.in @@ -22,6 +22,7 @@ DOCVERSION=@DOCVERSION@ DOCVERSION=development CC=@CC@ +CXX=@CXX@ EXEEXT=@EXEEXT@ # Resource compiler, currently used under MinGW @@ -112,6 +113,8 @@ OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@ DEPFILES = $(OBJS:.o=.d) +.cc.o: + $(CXX) @CPPFLAGS@ -c $(GBCFLAGS) $< $(OUTPUT_SWITCH)$@ .c.o: $(CC) @CPPFLAGS@ -c $(GBCFLAGS) $< $(OUTPUT_SWITCH)$@ @@ -124,10 +127,10 @@ WEB=@DOCDIR@ all: gpsbabel$(EXEEXT) gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@ - $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@ + $(CXX) $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@ gpsbabel-debug: $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@ + $(CXX) $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@ Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \ gbversion.h.in gui/setup.iss.in @@ -140,7 +143,7 @@ config.status: configure $(SHELL) config.status --recheck jeeps/gpslibusb.o: - $(CC) @CPPFLAGS@ -c $(GBCFLAGS) @USB_CFLAGS@ @srcdir@/jeeps/gpslibusb.c $(OUTPUT_SWITCH)$@ + $(CXX) @CPPFLAGS@ -c $(GBCFLAGS) @USB_CFLAGS@ @srcdir@/jeeps/gpslibusb.cc $(OUTPUT_SWITCH)$@ fileinfo.o: win32/gpsbabel.rc $(RC) -o fileinfo.o win32/gpsbabel.rc @@ -326,13 +329,13 @@ release-rpm: # cross-configure: - CC=i386-mingw32-gcc LDFLAGS="-s" @srcdir@/configure --host=i386-pc-mingw32 --with-cet=all --with-expathdr=@srcdir@/mingw/include --with-libexpat=@srcdir@/mingw/lib + CXX=i386-mingw32-gcc LDFLAGS="-s" @srcdir@/configure --host=i386-pc-mingw32 --with-cet=all --with-expathdr=@srcdir@/mingw/include --with-libexpat=@srcdir@/mingw/lib release-winbuild: rm -fr /tmp/gpsbabel-$(VERSIOND)-cross cp -a gpsbabel-$(VERSIOND) /tmp/gpsbabel-$(VERSIOND)-cross cd /tmp/gpsbabel-$(VERSIOND)-cross ; \ - CC=i386-mingw32-gcc LDFLAGS="-s" ./configure --host=i386-pc-mingw32 --with-cet=all --with-expathdr=mingw/include --with-libexpat=mingw/lib && make && \ + CXX=i386-mingw32-gcc LDFLAGS="-s" ./configure --host=i386-pc-mingw32 --with-cet=all --with-expathdr=mingw/include --with-libexpat=mingw/lib && make && \ zip -j /tmp/gpsbabel-$(VERSIOND).zip $(WINFILES) rm -fr /tmp/gpsbabel-$(VERSIOND)-cross @@ -388,7 +391,7 @@ mac-gui-dmg: mac-gui mv gui/objects/GPSBabelFE.dmg gui/objects/GPSBabel-$(VERSIOND).dmg msvc-build: - make CC=@CL.EXE DEBUGGING="" EXTRA_CFLAGS="-nologo -W3 -WL -D__WIN32__ -I msvc/expat " OUTPUT_SWITCH="-Fo" $(OBJS) + make CXX=@CL.EXE DEBUGGING="" EXTRA_CFLAGS="-nologo -W3 -WL -D__WIN32__ -I msvc/expat " OUTPUT_SWITCH="-Fo" $(OBJS) echo $(OBJS) > objs.lst LINK.EXE /NOLOGO @objs.lst ./msvc/expat/libexpat.lib /out:gpsbabel.exe @@ -399,32 +402,32 @@ test-release: doc gpsbabel.html changes.html make release-tarball release-winbuild release-rpm # Machine generated from here down. -alan.o: alan.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +alan.o: alan.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h -an1.o: an1.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +an1.o: an1.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h an1sym.h -arcdist.o: arcdist.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +arcdist.o: arcdist.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h filterdefs.h \ grtcirc.h -avltree.o: avltree.c avltree.h defs.h config.h queue.h gbtypes.h \ +avltree.o: avltree.cc avltree.h defs.h config.h queue.h gbtypes.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -axim_gpb.o: axim_gpb.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +axim_gpb.o: axim_gpb.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -bcr.o: bcr.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +bcr.o: bcr.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h csv_util.h \ garmin_tables.h -bend.o: bend.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +bend.o: bend.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h filterdefs.h grtcirc.h -brauniger_iq.o: brauniger_iq.c defs.h config.h queue.h gbtypes.h \ +brauniger_iq.o: brauniger_iq.cc defs.h config.h queue.h gbtypes.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ gbser.h -bushnell.o: bushnell.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +bushnell.o: bushnell.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -bushnell_trl.o: bushnell_trl.c defs.h config.h queue.h gbtypes.h \ +bushnell_trl.o: bushnell_trl.cc defs.h config.h queue.h gbtypes.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -cet.o: cet.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +cet.o: cet.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h -cet_util.o: cet_util.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +cet_util.o: cet_util.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ cet/ansi_x3_4_1968.h cet/iso_8859_1.h cet/iso_8859_8.h \ cet/iso_8859_15.h cet/cp1252.h cet/cp1255.h cet/iso_8859_2.h \ @@ -436,27 +439,27 @@ cet_util.o: cet_util.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ cet/iso_8859_13.h cet/iso_8859_14.h cet/iso_8859_3.h cet/iso_8859_4.h \ cet/iso_8859_5.h cet/iso_8859_6.h cet/iso_8859_7.h cet/iso_8859_9.h \ cet/koi8_r.h cet/koi8_ru.h cet/koi_8.h -cetus.o: cetus.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +cetus.o: cetus.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h pdbfile.h -coastexp.o: coastexp.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +coastexp.o: coastexp.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h xmlgeneric.h \ uuid.h -compegps.o: compegps.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +compegps.o: compegps.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h csv_util.h \ jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h -copilot.o: copilot.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +copilot.o: copilot.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h pdbfile.h \ grtcirc.h -coto.o: coto.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +coto.o: coto.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h csv_util.h pdbfile.h \ grtcirc.h -cst.o: cst.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +cst.o: cst.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h strptime.h -csv_util.o: csv_util.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +csv_util.o: csv_util.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h csv_util.h \ grtcirc.h strptime.h jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ @@ -464,52 +467,52 @@ csv_util.o: csv_util.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ jeeps/gpsinput.h jeeps/gpsproj.h xmlgeneric.h garmin_fs.h jeeps/gps.h \ xcsv_tokens.gperf -delbin.o: delbin.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +delbin.o: delbin.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -delgpl.o: delgpl.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +delgpl.o: delgpl.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -destinator.o: destinator.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +destinator.o: destinator.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h garmin_fs.h \ jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h \ jeeps/gps.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h strptime.h -dg-100.o: dg-100.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +dg-100.o: dg-100.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h gbser.h -discard.o: discard.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +discard.o: discard.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h filterdefs.h -dmtlog.o: dmtlog.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +dmtlog.o: dmtlog.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h xmlgeneric.h -duplicate.o: duplicate.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +duplicate.o: duplicate.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h filterdefs.h -easygps.o: easygps.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +easygps.o: easygps.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -enigma.o: enigma.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +enigma.o: enigma.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -exif.o: exif.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +exif.o: exif.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h garmin_tables.h \ jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h strptime.h -explorist_ini.o: explorist_ini.c defs.h config.h queue.h gbtypes.h \ +explorist_ini.o: explorist_ini.cc defs.h config.h queue.h gbtypes.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ explorist_ini.h -fatal.o: fatal.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +fatal.o: fatal.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -filter_vecs.o: filter_vecs.c defs.h config.h queue.h gbtypes.h \ +filter_vecs.o: filter_vecs.cc defs.h config.h queue.h gbtypes.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ filterdefs.h gbversion.h -formspec.o: formspec.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +formspec.o: formspec.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -g7towin.o: g7towin.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +g7towin.o: g7towin.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h csv_util.h \ garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h jeeps/gpsread.h \ @@ -517,40 +520,40 @@ g7towin.o: g7towin.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ jeeps/gpsinput.h jeeps/gpsproj.h garmin_tables.h jeeps/gpsmath.h \ strptime.h -garmin.o: garmin.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +garmin.o: garmin.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h grtcirc.h \ jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h \ jeeps/gps.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h garmin_tables.h garmin_fs.h garmin_device_xml.h -garmin_device_xml.o: garmin_device_xml.c defs.h config.h queue.h \ +garmin_device_xml.o: garmin_device_xml.cc defs.h config.h queue.h \ gbtypes.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h \ session.h xmlgeneric.h garmin_device_xml.h -garmin_fit.o: garmin_fit.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +garmin_fit.o: garmin_fit.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -garmin_fs.o: garmin_fs.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +garmin_fs.o: garmin_fs.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h garmin_fs.h \ jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h \ jeeps/gps.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h garmin_tables.h -garmin_gpi.o: garmin_gpi.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +garmin_gpi.o: garmin_gpi.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h garmin_fs.h jeeps/gps.h garmin_gpi.h -garmin_tables.o: garmin_tables.c garmin_tables.h defs.h config.h queue.h \ +garmin_tables.o: garmin_tables.cc garmin_tables.h defs.h config.h queue.h \ gbtypes.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h \ session.h jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h -garmin_txt.o: garmin_txt.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +garmin_txt.o: garmin_txt.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h csv_util.h \ garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h jeeps/gpsread.h \ @@ -558,119 +561,119 @@ garmin_txt.o: garmin_txt.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ jeeps/gpsinput.h jeeps/gpsproj.h garmin_tables.h grtcirc.h \ jeeps/gpsmath.h strptime.h -garmin_xt.o: garmin_xt.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +garmin_xt.o: garmin_xt.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -gbfile.o: gbfile.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +gbfile.o: gbfile.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -gbser.o: gbser.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +gbser.o: gbser.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h gbser.h \ gbser_private.h -gbser_posix.o: gbser_posix.c defs.h config.h queue.h gbtypes.h \ +gbser_posix.o: gbser_posix.cc defs.h config.h queue.h gbtypes.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ gbser.h gbser_private.h -gbsleep.o: gbsleep.c config.h -gcdb.o: gcdb.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +gbsleep.o: gbsleep.cc config.h +gcdb.o: gcdb.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h pdbfile.h -gdb.o: gdb.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +gdb.o: gdb.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h csv_util.h garmin_fs.h \ jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h \ jeeps/gps.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h garmin_tables.h grtcirc.h jeeps/gpsmath.h -geo.o: geo.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +geo.o: geo.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h xmlgeneric.h -geoniche.o: geoniche.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +geoniche.o: geoniche.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h pdbfile.h \ jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h garmin_tables.h -ggv_log.o: ggv_log.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +ggv_log.o: ggv_log.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h grtcirc.h \ jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h -ggv_ovl.o: ggv_ovl.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +ggv_ovl.o: ggv_ovl.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h grtcirc.h -globals.o: globals.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +globals.o: globals.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h gbversion.h -glogbook.o: glogbook.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +glogbook.o: glogbook.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h xmlgeneric.h -gnav_trl.o: gnav_trl.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +gnav_trl.o: gnav_trl.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -google.o: google.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +google.o: google.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h xmlgeneric.h -gopal.o: gopal.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +gopal.o: gopal.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h csv_util.h \ strptime.h jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h grtcirc.h -gpilots.o: gpilots.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +gpilots.o: gpilots.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h pdbfile.h \ garmin_tables.h -gpspilot.o: gpspilot.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +gpspilot.o: gpspilot.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h pdbfile.h -gpssim.o: gpssim.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +gpssim.o: gpssim.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -gpsutil.o: gpsutil.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +gpsutil.o: gpsutil.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h magellan.h -gpx.o: gpx.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +gpx.o: gpx.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h xmlgeneric.h garmin_fs.h \ jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h \ jeeps/gps.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h -grtcirc.o: grtcirc.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +grtcirc.o: grtcirc.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h grtcirc.h -gtm.o: gtm.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +gtm.o: gtm.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h jeeps/gpsmath.h \ jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h \ jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \ jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \ jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h -gtrnctr.o: gtrnctr.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +gtrnctr.o: gtrnctr.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h xmlgeneric.h -height.o: height.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +height.o: height.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h filterdefs.h -hiketech.o: hiketech.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +hiketech.o: hiketech.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h xmlgeneric.h -holux.o: holux.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +holux.o: holux.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h holux.h -hsa_ndv.o: hsa_ndv.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +hsa_ndv.o: hsa_ndv.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -html.o: html.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +html.o: html.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h jeeps/gpsmath.h \ jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h \ jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \ jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \ jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h -humminbird.o: humminbird.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +humminbird.o: humminbird.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h avltree.h -igc.o: igc.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +igc.o: igc.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h -ignrando.o: ignrando.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +ignrando.o: ignrando.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h xmlgeneric.h -igo8.o: igo8.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +igo8.o: igo8.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h -ik3d.o: ik3d.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +ik3d.o: ik3d.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h xmlgeneric.h -inifile.o: inifile.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +inifile.o: inifile.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -internal_styles.o: internal_styles.c defs.h config.h queue.h gbtypes.h \ +internal_styles.o: internal_styles.cc defs.h config.h queue.h gbtypes.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -interpolate.o: interpolate.c defs.h config.h queue.h gbtypes.h \ +interpolate.o: interpolate.cc defs.h config.h queue.h gbtypes.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ filterdefs.h grtcirc.h -itracku.o: itracku.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +itracku.o: itracku.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h gbser.h -jeeps/gpsapp.o: jeeps/gpsapp.c jeeps/gps.h jeeps/../defs.h \ +jeeps/gpsapp.o: jeeps/gpsapp.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ @@ -679,7 +682,7 @@ jeeps/gpsapp.o: jeeps/gpsapp.c jeeps/gps.h jeeps/../defs.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h jeeps/garminusb.h \ jeeps/gpsusbint.h -jeeps/gpscom.o: jeeps/gpscom.c jeeps/gps.h jeeps/../defs.h \ +jeeps/gpscom.o: jeeps/gpscom.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ @@ -687,7 +690,7 @@ jeeps/gpscom.o: jeeps/gpscom.c jeeps/gps.h jeeps/../defs.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h -jeeps/gpsdevice.o: jeeps/gpsdevice.c jeeps/gps.h jeeps/../defs.h \ +jeeps/gpsdevice.o: jeeps/gpsdevice.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ @@ -695,7 +698,7 @@ jeeps/gpsdevice.o: jeeps/gpsdevice.c jeeps/gps.h jeeps/../defs.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h jeeps/gpsserial.h -jeeps/gpsdevice_ser.o: jeeps/gpsdevice_ser.c jeeps/gpsdevice.h \ +jeeps/gpsdevice_ser.o: jeeps/gpsdevice_ser.cc jeeps/gpsdevice.h \ jeeps/gps.h jeeps/../defs.h jeeps/../config.h jeeps/../queue.h \ jeeps/../gbtypes.h jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h \ jeeps/../gbfile.h jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h \ @@ -703,7 +706,7 @@ jeeps/gpsdevice_ser.o: jeeps/gpsdevice_ser.c jeeps/gpsdevice.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h jeeps/gpsserial.h -jeeps/gpsdevice_usb.o: jeeps/gpsdevice_usb.c jeeps/gpsdevice.h \ +jeeps/gpsdevice_usb.o: jeeps/gpsdevice_usb.cc jeeps/gpsdevice.h \ jeeps/gps.h jeeps/../defs.h jeeps/../config.h jeeps/../queue.h \ jeeps/../gbtypes.h jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h \ jeeps/../gbfile.h jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h \ @@ -712,7 +715,7 @@ jeeps/gpsdevice_usb.o: jeeps/gpsdevice_usb.c jeeps/gpsdevice.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h jeeps/garminusb.h \ jeeps/gpsusbint.h jeeps/gpsusbcommon.h -jeeps/gpslibusb.o: jeeps/gpslibusb.c config.h mac/libusb/usb.h \ +jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h mac/libusb/usb.h \ jeeps/gps.h jeeps/../defs.h jeeps/../config.h jeeps/../queue.h \ jeeps/../gbtypes.h jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h \ jeeps/../gbfile.h jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h \ @@ -721,7 +724,7 @@ jeeps/gpslibusb.o: jeeps/gpslibusb.c config.h mac/libusb/usb.h \ jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \ jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h \ jeeps/garminusb.h jeeps/gpsusbcommon.h jeeps/../garmin_device_xml.h -jeeps/gpsmath.o: jeeps/gpsmath.c jeeps/gps.h jeeps/../defs.h \ +jeeps/gpsmath.o: jeeps/gpsmath.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ @@ -729,7 +732,7 @@ jeeps/gpsmath.o: jeeps/gpsmath.c jeeps/gps.h jeeps/../defs.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h jeeps/gpsdatum.h -jeeps/gpsmem.o: jeeps/gpsmem.c jeeps/gps.h jeeps/../defs.h \ +jeeps/gpsmem.o: jeeps/gpsmem.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ @@ -737,7 +740,7 @@ jeeps/gpsmem.o: jeeps/gpsmem.c jeeps/gps.h jeeps/../defs.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h -jeeps/gpsprot.o: jeeps/gpsprot.c jeeps/gps.h jeeps/../defs.h \ +jeeps/gpsprot.o: jeeps/gpsprot.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ @@ -745,7 +748,7 @@ jeeps/gpsprot.o: jeeps/gpsprot.c jeeps/gps.h jeeps/../defs.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h -jeeps/gpsread.o: jeeps/gpsread.c jeeps/gps.h jeeps/../defs.h \ +jeeps/gpsread.o: jeeps/gpsread.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ @@ -753,7 +756,7 @@ jeeps/gpsread.o: jeeps/gpsread.c jeeps/gps.h jeeps/../defs.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h jeeps/gpsserial.h -jeeps/gpsrqst.o: jeeps/gpsrqst.c jeeps/gps.h jeeps/../defs.h \ +jeeps/gpsrqst.o: jeeps/gpsrqst.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ @@ -761,7 +764,7 @@ jeeps/gpsrqst.o: jeeps/gpsrqst.c jeeps/gps.h jeeps/../defs.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h -jeeps/gpssend.o: jeeps/gpssend.c jeeps/gps.h jeeps/../defs.h \ +jeeps/gpssend.o: jeeps/gpssend.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ @@ -769,7 +772,7 @@ jeeps/gpssend.o: jeeps/gpssend.c jeeps/gps.h jeeps/../defs.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h jeeps/gpsserial.h -jeeps/gpsserial.o: jeeps/gpsserial.c jeeps/gps.h jeeps/../defs.h \ +jeeps/gpsserial.o: jeeps/gpsserial.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ @@ -778,7 +781,7 @@ jeeps/gpsserial.o: jeeps/gpsserial.c jeeps/gps.h jeeps/../defs.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h jeeps/gpsserial.h \ jeeps/../gbser.h -jeeps/gpsusbcommon.o: jeeps/gpsusbcommon.c jeeps/gps.h jeeps/../defs.h \ +jeeps/gpsusbcommon.o: jeeps/gpsusbcommon.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ @@ -787,7 +790,7 @@ jeeps/gpsusbcommon.o: jeeps/gpsusbcommon.c jeeps/gps.h jeeps/../defs.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h jeeps/garminusb.h \ jeeps/gpsusbcommon.h -jeeps/gpsusbread.o: jeeps/gpsusbread.c jeeps/gps.h jeeps/../defs.h \ +jeeps/gpsusbread.o: jeeps/gpsusbread.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ @@ -796,7 +799,7 @@ jeeps/gpsusbread.o: jeeps/gpsusbread.c jeeps/gps.h jeeps/../defs.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h jeeps/garminusb.h \ jeeps/gpsusbint.h -jeeps/gpsusbsend.o: jeeps/gpsusbsend.c jeeps/gps.h jeeps/../defs.h \ +jeeps/gpsusbsend.o: jeeps/gpsusbsend.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ @@ -805,7 +808,7 @@ jeeps/gpsusbsend.o: jeeps/gpsusbsend.c jeeps/gps.h jeeps/../defs.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h jeeps/garminusb.h \ jeeps/gpsusbint.h -jeeps/gpsutil.o: jeeps/gpsutil.c jeeps/gps.h jeeps/../defs.h \ +jeeps/gpsutil.o: jeeps/gpsutil.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ @@ -813,22 +816,22 @@ jeeps/gpsutil.o: jeeps/gpsutil.c jeeps/gps.h jeeps/../defs.h \ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h -jogmap.o: jogmap.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +jogmap.o: jogmap.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h xmlgeneric.h \ jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h garmin_tables.h -jtr.o: jtr.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +jtr.o: jtr.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h csv_util.h avltree.h -kml.o: kml.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +kml.o: kml.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h xmlgeneric.h grtcirc.h -lmx.o: lmx.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +lmx.o: lmx.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h xmlgeneric.h -lowranceusr.o: lowranceusr.c defs.h config.h queue.h gbtypes.h \ +lowranceusr.o: lowranceusr.cc defs.h config.h queue.h gbtypes.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -lowranceusr4.o: lowranceusr4.c defs.h config.h queue.h gbtypes.h \ +lowranceusr4.o: lowranceusr4.cc defs.h config.h queue.h gbtypes.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h mac/libusb/darwin.o: mac/libusb/darwin.c config.h mac/libusb/usbi.h \ mac/libusb/usb.h mac/libusb/error.h @@ -838,304 +841,304 @@ mac/libusb/error.o: mac/libusb/error.c mac/libusb/usb.h \ mac/libusb/error.h mac/libusb/usb.o: mac/libusb/usb.c mac/libusb/usbi.h mac/libusb/usb.h \ mac/libusb/error.h -mag_pdb.o: mag_pdb.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +mag_pdb.o: mag_pdb.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h pdbfile.h \ jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h -maggeo.o: maggeo.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +maggeo.o: maggeo.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h csv_util.h \ xmlgeneric.h magellan.h -magnav.o: magnav.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +magnav.o: magnav.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h pdbfile.h -magproto.o: magproto.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +magproto.o: magproto.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h magellan.h \ gbser.h explorist_ini.h -main.o: main.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +main.o: main.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h filterdefs.h csv_util.h -mapasia.o: mapasia.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +mapasia.o: mapasia.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -mapsend.o: mapsend.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +mapsend.o: mapsend.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h mapsend.h \ magellan.h -mapsource.o: mapsource.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +mapsource.o: mapsource.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ garmin_tables.h jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ jeeps/gpsinput.h jeeps/gpsproj.h -mkshort.o: mkshort.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +mkshort.o: mkshort.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -mmo.o: mmo.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +mmo.o: mmo.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h avltree.h -msroute.o: msroute.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +msroute.o: msroute.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h -mtk_locus.o: mtk_locus.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +mtk_locus.o: mtk_locus.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h gbser.h -mtk_logger.o: mtk_logger.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +mtk_logger.o: mtk_logger.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h gbser.h -navicache.o: navicache.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +navicache.o: navicache.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -naviguide.o: naviguide.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +naviguide.o: naviguide.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h csv_util.h \ jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h -navilink.o: navilink.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +navilink.o: navilink.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h gbser.h \ jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h navilink.h -navitel.o: navitel.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +navitel.o: navitel.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h -netstumbler.o: netstumbler.c defs.h config.h queue.h gbtypes.h \ +netstumbler.o: netstumbler.cc defs.h config.h queue.h gbtypes.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ csv_util.h -nmea.o: nmea.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +nmea.o: nmea.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h gbser.h strptime.h \ jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h -nmn4.o: nmn4.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +nmn4.o: nmn4.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h csv_util.h -nukedata.o: nukedata.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +nukedata.o: nukedata.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h filterdefs.h -osm.o: osm.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +osm.o: osm.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h avltree.h xmlgeneric.h -overlay.o: overlay.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +overlay.o: overlay.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h grtcirc.h -ozi.o: ozi.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +ozi.o: ozi.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h csv_util.h \ jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h -palmdoc.o: palmdoc.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +palmdoc.o: palmdoc.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h pdbfile.h -parse.o: parse.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +parse.o: parse.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h strptime.h -pathaway.o: pathaway.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +pathaway.o: pathaway.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h csv_util.h \ pdbfile.h strptime.h -pcx.o: pcx.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +pcx.o: pcx.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h garmin_tables.h \ csv_util.h -pdbfile.o: pdbfile.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +pdbfile.o: pdbfile.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h pdbfile.h -pocketfms_bc.o: pocketfms_bc.c defs.h config.h queue.h gbtypes.h \ +pocketfms_bc.o: pocketfms_bc.cc defs.h config.h queue.h gbtypes.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -pocketfms_fp.o: pocketfms_fp.c defs.h config.h queue.h gbtypes.h \ +pocketfms_fp.o: pocketfms_fp.cc defs.h config.h queue.h gbtypes.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ xmlgeneric.h -pocketfms_wp.o: pocketfms_wp.c defs.h config.h queue.h gbtypes.h \ +pocketfms_wp.o: pocketfms_wp.cc defs.h config.h queue.h gbtypes.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ csv_util.h -polygon.o: polygon.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +polygon.o: polygon.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h filterdefs.h -position.o: position.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +position.o: position.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h filterdefs.h \ grtcirc.h -psitrex.o: psitrex.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +psitrex.o: psitrex.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ garmin_tables.h -psp.o: psp.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +psp.o: psp.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h grtcirc.h -queue.o: queue.c queue.h -quovadis.o: quovadis.c quovadis.h defs.h config.h queue.h gbtypes.h \ +queue.o: queue.cc queue.h +quovadis.o: quovadis.cc quovadis.h defs.h config.h queue.h gbtypes.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ pdbfile.h -radius.o: radius.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +radius.o: radius.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h filterdefs.h \ grtcirc.h -random.o: random.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +random.o: random.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h garmin_fs.h \ jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h \ jeeps/gps.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h jeeps/gpsmath.h -raymarine.o: raymarine.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +raymarine.o: raymarine.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h csv_util.h -reverse_route.o: reverse_route.c defs.h config.h queue.h gbtypes.h \ +reverse_route.o: reverse_route.cc defs.h config.h queue.h gbtypes.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ filterdefs.h -rgbcolors.o: rgbcolors.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +rgbcolors.o: rgbcolors.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -route.o: route.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +route.o: route.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h grtcirc.h -saroute.o: saroute.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +saroute.o: saroute.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h grtcirc.h -sbn.o: sbn.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +sbn.o: sbn.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h navilink.h -sbp.o: sbp.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +sbp.o: sbp.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h navilink.h -session.o: session.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +session.o: session.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -shape.o: shape.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +shape.o: shape.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ shapelib/shapefil.h shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h config.h shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h config.h -skyforce.o: skyforce.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +skyforce.o: skyforce.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h strptime.h -skytraq.o: skytraq.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +skytraq.o: skytraq.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h gbser.h -smplrout.o: smplrout.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +smplrout.o: smplrout.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h filterdefs.h \ grtcirc.h -sort.o: sort.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +sort.o: sort.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h filterdefs.h -stackfilter.o: stackfilter.c defs.h config.h queue.h gbtypes.h \ +stackfilter.o: stackfilter.cc defs.h config.h queue.h gbtypes.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ filterdefs.h -stmsdf.o: stmsdf.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +stmsdf.o: stmsdf.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h csv_util.h \ strptime.h jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h grtcirc.h -stmwpp.o: stmwpp.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +stmwpp.o: stmwpp.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h csv_util.h -strptime.o: strptime.c config.h strptime.h -subrip.o: subrip.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +strptime.o: strptime.cc config.h strptime.h +subrip.o: subrip.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -swapdata.o: swapdata.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +swapdata.o: swapdata.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h filterdefs.h -tef_xml.o: tef_xml.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +tef_xml.o: tef_xml.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h xmlgeneric.h -teletype.o: teletype.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +teletype.o: teletype.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -text.o: text.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +text.o: text.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h jeeps/gpsmath.h \ jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h \ jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \ jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \ jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h -tiger.o: tiger.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +tiger.o: tiger.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h csv_util.h -tmpro.o: tmpro.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +tmpro.o: tmpro.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h csv_util.h -tomtom.o: tomtom.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +tomtom.o: tomtom.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -tpg.o: tpg.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +tpg.o: tpg.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h jeeps/gpsmath.h \ jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h \ jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \ jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \ jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h -tpo.o: tpo.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +tpo.o: tpo.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h jeeps/gpsmath.h \ jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h \ jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \ jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \ jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h -trackfilter.o: trackfilter.c defs.h config.h queue.h gbtypes.h \ +trackfilter.o: trackfilter.cc defs.h config.h queue.h gbtypes.h \ zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ filterdefs.h strptime.h grtcirc.h xmlgeneric.h -transform.o: transform.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +transform.o: transform.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h filterdefs.h -unicsv.o: unicsv.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +unicsv.o: unicsv.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h csv_util.h \ garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h jeeps/gpsread.h \ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ jeeps/gpsinput.h jeeps/gpsproj.h garmin_tables.h jeeps/gpsmath.h -units.o: units.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +units.o: units.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -util.o: util.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +util.o: util.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h jeeps/gpsmath.h \ jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h \ jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \ jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \ jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h -util_crc.o: util_crc.c -uuid.o: uuid.c uuid.h -v900.o: v900.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +util_crc.o: util_crc.cc +uuid.o: uuid.cc uuid.h +v900.o: v900.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h -vcf.o: vcf.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +vcf.o: vcf.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h jeeps/gpsmath.h \ jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h \ jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \ jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \ jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h -vecs.o: vecs.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +vecs.o: vecs.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h csv_util.h gbversion.h -vidaone.o: vidaone.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +vidaone.o: vidaone.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -vitosmt.o: vitosmt.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +vitosmt.o: vitosmt.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h grtcirc.h -vitovtt.o: vitovtt.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +vitovtt.o: vitovtt.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -vmem.o: vmem.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +vmem.o: vmem.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h -vpl.o: vpl.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +vpl.o: vpl.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h -waypt.o: waypt.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +waypt.o: waypt.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h grtcirc.h \ garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gps.h jeeps/gpssend.h jeeps/gpsread.h \ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ jeeps/gpsinput.h jeeps/gpsproj.h -wbt-200.o: wbt-200.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +wbt-200.o: wbt-200.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h gbser.h \ grtcirc.h -wfff_xml.o: wfff_xml.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +wfff_xml.o: wfff_xml.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h xmlgeneric.h -wintec_tes.o: wintec_tes.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +wintec_tes.o: wintec_tes.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -xcsv.o: xcsv.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +xcsv.o: xcsv.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h csv_util.h \ jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h -xhtmlent.o: xhtmlent.c -xmlgeneric.o: xmlgeneric.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +xhtmlent.o: xhtmlent.cc +xmlgeneric.o: xmlgeneric.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h xmlgeneric.h -xmltag.o: xmltag.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +xmltag.o: xmltag.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h -xol.o: xol.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ +xol.o: xol.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h session.h xmlgeneric.h \ jeeps/gpsmath.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h garmin_tables.h -yahoo.o: yahoo.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ +yahoo.o: yahoo.cc defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h xmlgeneric.h zlib/adler32.o: zlib/adler32.c zlib/zlib.h zlib/zconf.h zlib/compress.o: zlib/compress.c zlib/zlib.h zlib/zconf.h diff --git a/gpsbabel/alan.c b/gpsbabel/alan.cc similarity index 100% rename from gpsbabel/alan.c rename to gpsbabel/alan.cc diff --git a/gpsbabel/an1.c b/gpsbabel/an1.cc similarity index 100% rename from gpsbabel/an1.c rename to gpsbabel/an1.cc diff --git a/gpsbabel/arcdist.c b/gpsbabel/arcdist.cc similarity index 100% rename from gpsbabel/arcdist.c rename to gpsbabel/arcdist.cc diff --git a/gpsbabel/avltree.c b/gpsbabel/avltree.cc similarity index 100% rename from gpsbabel/avltree.c rename to gpsbabel/avltree.cc diff --git a/gpsbabel/axim_gpb.c b/gpsbabel/axim_gpb.cc similarity index 100% rename from gpsbabel/axim_gpb.c rename to gpsbabel/axim_gpb.cc diff --git a/gpsbabel/bcr.c b/gpsbabel/bcr.cc similarity index 100% rename from gpsbabel/bcr.c rename to gpsbabel/bcr.cc diff --git a/gpsbabel/bend.c b/gpsbabel/bend.cc similarity index 100% rename from gpsbabel/bend.c rename to gpsbabel/bend.cc diff --git a/gpsbabel/brauniger_iq.c b/gpsbabel/brauniger_iq.cc similarity index 100% rename from gpsbabel/brauniger_iq.c rename to gpsbabel/brauniger_iq.cc diff --git a/gpsbabel/bushnell.c b/gpsbabel/bushnell.cc similarity index 100% rename from gpsbabel/bushnell.c rename to gpsbabel/bushnell.cc diff --git a/gpsbabel/bushnell_trl.c b/gpsbabel/bushnell_trl.cc similarity index 100% rename from gpsbabel/bushnell_trl.c rename to gpsbabel/bushnell_trl.cc diff --git a/gpsbabel/cet.c b/gpsbabel/cet.cc similarity index 100% rename from gpsbabel/cet.c rename to gpsbabel/cet.cc diff --git a/gpsbabel/cet_util.c b/gpsbabel/cet_util.cc similarity index 100% rename from gpsbabel/cet_util.c rename to gpsbabel/cet_util.cc diff --git a/gpsbabel/cetus.c b/gpsbabel/cetus.cc similarity index 100% rename from gpsbabel/cetus.c rename to gpsbabel/cetus.cc diff --git a/gpsbabel/coastexp.c b/gpsbabel/coastexp.cc similarity index 100% rename from gpsbabel/coastexp.c rename to gpsbabel/coastexp.cc diff --git a/gpsbabel/compegps.c b/gpsbabel/compegps.cc similarity index 100% rename from gpsbabel/compegps.c rename to gpsbabel/compegps.cc diff --git a/gpsbabel/configure b/gpsbabel/configure index a6717979a..8afba0e05 100755 --- a/gpsbabel/configure +++ b/gpsbabel/configure @@ -676,6 +676,9 @@ CPPFLAGS ac_ct_CC EXEEXT OBJEXT +CXX +CXXFLAGS +ac_ct_CXX INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA @@ -709,6 +712,9 @@ CFLAGS LDFLAGS LIBS CPPFLAGS +CXX +CXXFLAGS +CCC CPP' @@ -1309,6 +1315,8 @@ Some influential environment variables: LIBS libraries to pass to the linker, e.g. -l CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory + CXX C++ compiler command + CXXFLAGS C++ compiler flags CPP C preprocessor Use these variables to override the choices made by `configure' or to help @@ -2853,6 +2861,370 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + { echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$CXX" && break + done +fi +if test -z "$CXX"; then + ac_ct_CXX=$CXX + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$ac_ct_CXX" && break +done + + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi +fi + + fi +fi +# Provide some information about the compiler. +echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } +GXX=`test $ac_compiler_gnu = yes && echo yes` +ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_save_CXXFLAGS=$CXXFLAGS +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } +if test "${ac_cv_prog_cxx_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + CXXFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -5676,6 +6048,9 @@ CPPFLAGS!$CPPFLAGS$ac_delim ac_ct_CC!$ac_ct_CC$ac_delim EXEEXT!$EXEEXT$ac_delim OBJEXT!$OBJEXT$ac_delim +CXX!$CXX$ac_delim +CXXFLAGS!$CXXFLAGS$ac_delim +ac_ct_CXX!$ac_ct_CXX$ac_delim INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim INSTALL_DATA!$INSTALL_DATA$ac_delim @@ -5702,7 +6077,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/gpsbabel/configure.in b/gpsbabel/configure.in index 661b5d6b3..eb6e30e97 100644 --- a/gpsbabel/configure.in +++ b/gpsbabel/configure.in @@ -38,6 +38,7 @@ AC_CANONICAL_TARGET # Checks for programs. AC_PROG_CC +AC_PROG_CXX AC_PROG_INSTALL AC_PROG_MAKE_SET AC_EXEEXT diff --git a/gpsbabel/copilot.c b/gpsbabel/copilot.cc similarity index 100% rename from gpsbabel/copilot.c rename to gpsbabel/copilot.cc diff --git a/gpsbabel/coto.c b/gpsbabel/coto.cc similarity index 100% rename from gpsbabel/coto.c rename to gpsbabel/coto.cc diff --git a/gpsbabel/cst.c b/gpsbabel/cst.cc similarity index 100% rename from gpsbabel/cst.c rename to gpsbabel/cst.cc diff --git a/gpsbabel/csv_util.c b/gpsbabel/csv_util.cc similarity index 99% rename from gpsbabel/csv_util.c rename to gpsbabel/csv_util.cc index e2dfa95e9..385e70153 100644 --- a/gpsbabel/csv_util.c +++ b/gpsbabel/csv_util.cc @@ -1000,7 +1000,7 @@ static void xcsv_parse_val(const char* s, waypoint* wpt, const field_map_t* fmp, route_head** trk) { - char* enclosure = ""; + const char* enclosure = ""; geocache_data* gc_data = NULL; if (!fmp->printfc) { @@ -1559,7 +1559,7 @@ xcsv_waypt_pr(const waypoint* wpt) char* shortname = NULL; char* description = NULL; char* anyname = NULL; - char* write_delimiter; + const char* write_delimiter; int i; field_map_t* fmp; queue* elem, *tmp; @@ -2057,7 +2057,7 @@ xcsv_waypt_pr(const waypoint* wpt) field_is_unknown = !wpt->sat; break; case XT_GPS_FIX: { - char* fix = NULL; + const char* fix = NULL; switch (wpt->fix) { case fix_unknown: field_is_unknown = 1; diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h index f01c5a822..38ad1c053 100644 --- a/gpsbabel/defs.h +++ b/gpsbabel/defs.h @@ -1051,9 +1051,9 @@ typedef enum { } fmt_units; int fmt_setunits(fmt_units); -double fmt_distance(const double, char** tag); -double fmt_altitude(const double, char** tag); -double fmt_speed(const double, char** tag); +double fmt_distance(const double, const char** tag); +double fmt_altitude(const double, const char** tag); +double fmt_speed(const double, const char** tag); /* * From gbsleep.c diff --git a/gpsbabel/delbin.c b/gpsbabel/delbin.cc similarity index 100% rename from gpsbabel/delbin.c rename to gpsbabel/delbin.cc diff --git a/gpsbabel/delgpl.c b/gpsbabel/delgpl.cc similarity index 100% rename from gpsbabel/delgpl.c rename to gpsbabel/delgpl.cc diff --git a/gpsbabel/destinator.c b/gpsbabel/destinator.cc similarity index 100% rename from gpsbabel/destinator.c rename to gpsbabel/destinator.cc diff --git a/gpsbabel/dg-100.c b/gpsbabel/dg-100.cc similarity index 100% rename from gpsbabel/dg-100.c rename to gpsbabel/dg-100.cc diff --git a/gpsbabel/discard.c b/gpsbabel/discard.cc similarity index 100% rename from gpsbabel/discard.c rename to gpsbabel/discard.cc diff --git a/gpsbabel/dmtlog.c b/gpsbabel/dmtlog.cc similarity index 100% rename from gpsbabel/dmtlog.c rename to gpsbabel/dmtlog.cc diff --git a/gpsbabel/duplicate.c b/gpsbabel/duplicate.cc similarity index 100% rename from gpsbabel/duplicate.c rename to gpsbabel/duplicate.cc diff --git a/gpsbabel/easygps.c b/gpsbabel/easygps.cc similarity index 100% rename from gpsbabel/easygps.c rename to gpsbabel/easygps.cc diff --git a/gpsbabel/enigma.c b/gpsbabel/enigma.cc similarity index 100% rename from gpsbabel/enigma.c rename to gpsbabel/enigma.cc diff --git a/gpsbabel/exif.c b/gpsbabel/exif.cc similarity index 100% rename from gpsbabel/exif.c rename to gpsbabel/exif.cc diff --git a/gpsbabel/explorist_ini.c b/gpsbabel/explorist_ini.cc similarity index 100% rename from gpsbabel/explorist_ini.c rename to gpsbabel/explorist_ini.cc diff --git a/gpsbabel/fatal.c b/gpsbabel/fatal.cc similarity index 100% rename from gpsbabel/fatal.c rename to gpsbabel/fatal.cc diff --git a/gpsbabel/filter_skeleton.c b/gpsbabel/filter_skeleton.cc similarity index 100% rename from gpsbabel/filter_skeleton.c rename to gpsbabel/filter_skeleton.cc diff --git a/gpsbabel/filter_vecs.c b/gpsbabel/filter_vecs.cc similarity index 100% rename from gpsbabel/filter_vecs.c rename to gpsbabel/filter_vecs.cc diff --git a/gpsbabel/format_skeleton.c b/gpsbabel/format_skeleton.cc similarity index 100% rename from gpsbabel/format_skeleton.c rename to gpsbabel/format_skeleton.cc diff --git a/gpsbabel/formspec.c b/gpsbabel/formspec.cc similarity index 100% rename from gpsbabel/formspec.c rename to gpsbabel/formspec.cc diff --git a/gpsbabel/g7towin.c b/gpsbabel/g7towin.cc similarity index 100% rename from gpsbabel/g7towin.c rename to gpsbabel/g7towin.cc diff --git a/gpsbabel/garmin.c b/gpsbabel/garmin.cc similarity index 100% rename from gpsbabel/garmin.c rename to gpsbabel/garmin.cc diff --git a/gpsbabel/garmin_device_xml.c b/gpsbabel/garmin_device_xml.cc similarity index 100% rename from gpsbabel/garmin_device_xml.c rename to gpsbabel/garmin_device_xml.cc diff --git a/gpsbabel/garmin_fit.c b/gpsbabel/garmin_fit.cc similarity index 100% rename from gpsbabel/garmin_fit.c rename to gpsbabel/garmin_fit.cc diff --git a/gpsbabel/garmin_fs.c b/gpsbabel/garmin_fs.cc similarity index 99% rename from gpsbabel/garmin_fs.c rename to gpsbabel/garmin_fs.cc index 1ff788268..e52c48d0b 100644 --- a/gpsbabel/garmin_fs.c +++ b/gpsbabel/garmin_fs.cc @@ -229,7 +229,7 @@ garmin_fs_xml_fprint(gbfile* ofd, const waypoint* waypt) gbfprintf(ofd, "%*s%.6f\n", space * 2, "", waypt->depth); } if (gmsd->flags.display) { - char* cx; + const char* cx; switch (gmsd->display) { case gt_display_mode_symbol: cx = "SymbolOnly"; diff --git a/gpsbabel/garmin_gpi.c b/gpsbabel/garmin_gpi.cc similarity index 100% rename from gpsbabel/garmin_gpi.c rename to gpsbabel/garmin_gpi.cc diff --git a/gpsbabel/garmin_tables.c b/gpsbabel/garmin_tables.cc similarity index 99% rename from gpsbabel/garmin_tables.c rename to gpsbabel/garmin_tables.cc index 5139fe350..49ceea926 100644 --- a/gpsbabel/garmin_tables.c +++ b/gpsbabel/garmin_tables.cc @@ -1051,7 +1051,7 @@ gt_color_value(const int garmin_index) gbuint32 gt_color_value_by_name(const char* name) { - int i; + unsigned int i; for (i = 0; i < GT_COLORS_CT; i++) if (case_ignore_strcmp(gt_colors[i].name, name) == 0) { @@ -1064,7 +1064,7 @@ gt_color_value_by_name(const char* name) int gt_color_index_by_name(const char* name) { - int i; + unsigned int i; for (i = 0; i < GT_COLORS_CT; i++) if (case_ignore_strcmp(name, gt_colors[i].name) == 0) { @@ -1077,7 +1077,7 @@ gt_color_index_by_name(const char* name) int gt_color_index_by_rgb(const int rgb) { - int i; + unsigned int i; for (i = 0; i < GT_COLORS_CT; i++) if (rgb == gt_colors[i].rgb) { diff --git a/gpsbabel/garmin_txt.c b/gpsbabel/garmin_txt.cc similarity index 100% rename from gpsbabel/garmin_txt.c rename to gpsbabel/garmin_txt.cc diff --git a/gpsbabel/garmin_xt.c b/gpsbabel/garmin_xt.cc similarity index 100% rename from gpsbabel/garmin_xt.c rename to gpsbabel/garmin_xt.cc diff --git a/gpsbabel/gbfile.c b/gpsbabel/gbfile.cc similarity index 100% rename from gpsbabel/gbfile.c rename to gpsbabel/gbfile.cc diff --git a/gpsbabel/gbser.c b/gpsbabel/gbser.cc similarity index 100% rename from gpsbabel/gbser.c rename to gpsbabel/gbser.cc diff --git a/gpsbabel/gbser_posix.c b/gpsbabel/gbser_posix.cc similarity index 100% rename from gpsbabel/gbser_posix.c rename to gpsbabel/gbser_posix.cc diff --git a/gpsbabel/gbser_win.c b/gpsbabel/gbser_win.cc similarity index 100% rename from gpsbabel/gbser_win.c rename to gpsbabel/gbser_win.cc diff --git a/gpsbabel/gbsleep.c b/gpsbabel/gbsleep.cc similarity index 100% rename from gpsbabel/gbsleep.c rename to gpsbabel/gbsleep.cc diff --git a/gpsbabel/gcdb.c b/gpsbabel/gcdb.cc similarity index 100% rename from gpsbabel/gcdb.c rename to gpsbabel/gcdb.cc diff --git a/gpsbabel/gdb.c b/gpsbabel/gdb.cc similarity index 100% rename from gpsbabel/gdb.c rename to gpsbabel/gdb.cc diff --git a/gpsbabel/geo.c b/gpsbabel/geo.cc similarity index 100% rename from gpsbabel/geo.c rename to gpsbabel/geo.cc diff --git a/gpsbabel/geoniche.c b/gpsbabel/geoniche.cc similarity index 100% rename from gpsbabel/geoniche.c rename to gpsbabel/geoniche.cc diff --git a/gpsbabel/ggv_log.c b/gpsbabel/ggv_log.cc similarity index 100% rename from gpsbabel/ggv_log.c rename to gpsbabel/ggv_log.cc diff --git a/gpsbabel/ggv_ovl.c b/gpsbabel/ggv_ovl.cc similarity index 100% rename from gpsbabel/ggv_ovl.c rename to gpsbabel/ggv_ovl.cc diff --git a/gpsbabel/globals.c b/gpsbabel/globals.cc similarity index 100% rename from gpsbabel/globals.c rename to gpsbabel/globals.cc diff --git a/gpsbabel/glogbook.c b/gpsbabel/glogbook.cc similarity index 100% rename from gpsbabel/glogbook.c rename to gpsbabel/glogbook.cc diff --git a/gpsbabel/gnav_trl.c b/gpsbabel/gnav_trl.cc similarity index 100% rename from gpsbabel/gnav_trl.c rename to gpsbabel/gnav_trl.cc diff --git a/gpsbabel/google.c b/gpsbabel/google.cc similarity index 100% rename from gpsbabel/google.c rename to gpsbabel/google.cc diff --git a/gpsbabel/gopal.c b/gpsbabel/gopal.cc similarity index 100% rename from gpsbabel/gopal.c rename to gpsbabel/gopal.cc diff --git a/gpsbabel/gpilots.c b/gpsbabel/gpilots.cc similarity index 100% rename from gpsbabel/gpilots.c rename to gpsbabel/gpilots.cc diff --git a/gpsbabel/gpspilot.c b/gpsbabel/gpspilot.cc similarity index 100% rename from gpsbabel/gpspilot.c rename to gpsbabel/gpspilot.cc diff --git a/gpsbabel/gpssim.c b/gpsbabel/gpssim.cc similarity index 100% rename from gpsbabel/gpssim.c rename to gpsbabel/gpssim.cc diff --git a/gpsbabel/gpsutil.c b/gpsbabel/gpsutil.cc similarity index 100% rename from gpsbabel/gpsutil.c rename to gpsbabel/gpsutil.cc diff --git a/gpsbabel/gpx.c b/gpsbabel/gpx.cc similarity index 100% rename from gpsbabel/gpx.c rename to gpsbabel/gpx.cc diff --git a/gpsbabel/grtcirc.c b/gpsbabel/grtcirc.cc similarity index 100% rename from gpsbabel/grtcirc.c rename to gpsbabel/grtcirc.cc diff --git a/gpsbabel/gtm.c b/gpsbabel/gtm.cc similarity index 100% rename from gpsbabel/gtm.c rename to gpsbabel/gtm.cc diff --git a/gpsbabel/gtrnctr.c b/gpsbabel/gtrnctr.cc similarity index 100% rename from gpsbabel/gtrnctr.c rename to gpsbabel/gtrnctr.cc diff --git a/gpsbabel/height.c b/gpsbabel/height.cc similarity index 100% rename from gpsbabel/height.c rename to gpsbabel/height.cc diff --git a/gpsbabel/hiketech.c b/gpsbabel/hiketech.cc similarity index 100% rename from gpsbabel/hiketech.c rename to gpsbabel/hiketech.cc diff --git a/gpsbabel/holux.c b/gpsbabel/holux.cc similarity index 100% rename from gpsbabel/holux.c rename to gpsbabel/holux.cc diff --git a/gpsbabel/hsa_ndv.c b/gpsbabel/hsa_ndv.cc similarity index 100% rename from gpsbabel/hsa_ndv.c rename to gpsbabel/hsa_ndv.cc diff --git a/gpsbabel/html.c b/gpsbabel/html.cc similarity index 100% rename from gpsbabel/html.c rename to gpsbabel/html.cc diff --git a/gpsbabel/humminbird.c b/gpsbabel/humminbird.cc similarity index 100% rename from gpsbabel/humminbird.c rename to gpsbabel/humminbird.cc diff --git a/gpsbabel/igc.c b/gpsbabel/igc.cc similarity index 100% rename from gpsbabel/igc.c rename to gpsbabel/igc.cc diff --git a/gpsbabel/ignrando.c b/gpsbabel/ignrando.cc similarity index 100% rename from gpsbabel/ignrando.c rename to gpsbabel/ignrando.cc diff --git a/gpsbabel/igo8.c b/gpsbabel/igo8.cc similarity index 100% rename from gpsbabel/igo8.c rename to gpsbabel/igo8.cc diff --git a/gpsbabel/ik3d.c b/gpsbabel/ik3d.cc similarity index 100% rename from gpsbabel/ik3d.c rename to gpsbabel/ik3d.cc diff --git a/gpsbabel/inifile.c b/gpsbabel/inifile.cc similarity index 100% rename from gpsbabel/inifile.c rename to gpsbabel/inifile.cc diff --git a/gpsbabel/interpolate.c b/gpsbabel/interpolate.cc similarity index 100% rename from gpsbabel/interpolate.c rename to gpsbabel/interpolate.cc diff --git a/gpsbabel/itracku.c b/gpsbabel/itracku.cc similarity index 100% rename from gpsbabel/itracku.c rename to gpsbabel/itracku.cc diff --git a/gpsbabel/jeeps/gpsapp.c b/gpsbabel/jeeps/gpsapp.cc similarity index 100% rename from gpsbabel/jeeps/gpsapp.c rename to gpsbabel/jeeps/gpsapp.cc diff --git a/gpsbabel/jeeps/gpscom.c b/gpsbabel/jeeps/gpscom.cc similarity index 100% rename from gpsbabel/jeeps/gpscom.c rename to gpsbabel/jeeps/gpscom.cc diff --git a/gpsbabel/jeeps/gpsdevice.c b/gpsbabel/jeeps/gpsdevice.cc similarity index 100% rename from gpsbabel/jeeps/gpsdevice.c rename to gpsbabel/jeeps/gpsdevice.cc diff --git a/gpsbabel/jeeps/gpsdevice_ser.c b/gpsbabel/jeeps/gpsdevice_ser.cc similarity index 100% rename from gpsbabel/jeeps/gpsdevice_ser.c rename to gpsbabel/jeeps/gpsdevice_ser.cc diff --git a/gpsbabel/jeeps/gpsdevice_usb.c b/gpsbabel/jeeps/gpsdevice_usb.cc similarity index 100% rename from gpsbabel/jeeps/gpsdevice_usb.c rename to gpsbabel/jeeps/gpsdevice_usb.cc diff --git a/gpsbabel/jeeps/gpsfmt.c b/gpsbabel/jeeps/gpsfmt.cc similarity index 100% rename from gpsbabel/jeeps/gpsfmt.c rename to gpsbabel/jeeps/gpsfmt.cc diff --git a/gpsbabel/jeeps/gpsinput.c b/gpsbabel/jeeps/gpsinput.cc similarity index 100% rename from gpsbabel/jeeps/gpsinput.c rename to gpsbabel/jeeps/gpsinput.cc diff --git a/gpsbabel/jeeps/gpslibusb.c b/gpsbabel/jeeps/gpslibusb.cc similarity index 100% rename from gpsbabel/jeeps/gpslibusb.c rename to gpsbabel/jeeps/gpslibusb.cc diff --git a/gpsbabel/jeeps/gpsmath.c b/gpsbabel/jeeps/gpsmath.cc similarity index 100% rename from gpsbabel/jeeps/gpsmath.c rename to gpsbabel/jeeps/gpsmath.cc diff --git a/gpsbabel/jeeps/gpsmem.c b/gpsbabel/jeeps/gpsmem.cc similarity index 100% rename from gpsbabel/jeeps/gpsmem.c rename to gpsbabel/jeeps/gpsmem.cc diff --git a/gpsbabel/jeeps/gpsproj.c b/gpsbabel/jeeps/gpsproj.cc similarity index 100% rename from gpsbabel/jeeps/gpsproj.c rename to gpsbabel/jeeps/gpsproj.cc diff --git a/gpsbabel/jeeps/gpsprot.c b/gpsbabel/jeeps/gpsprot.cc similarity index 100% rename from gpsbabel/jeeps/gpsprot.c rename to gpsbabel/jeeps/gpsprot.cc diff --git a/gpsbabel/jeeps/gpsread.c b/gpsbabel/jeeps/gpsread.cc similarity index 100% rename from gpsbabel/jeeps/gpsread.c rename to gpsbabel/jeeps/gpsread.cc diff --git a/gpsbabel/jeeps/gpsrqst.c b/gpsbabel/jeeps/gpsrqst.cc similarity index 100% rename from gpsbabel/jeeps/gpsrqst.c rename to gpsbabel/jeeps/gpsrqst.cc diff --git a/gpsbabel/jeeps/gpssend.c b/gpsbabel/jeeps/gpssend.cc similarity index 100% rename from gpsbabel/jeeps/gpssend.c rename to gpsbabel/jeeps/gpssend.cc diff --git a/gpsbabel/jeeps/gpsserial.c b/gpsbabel/jeeps/gpsserial.cc similarity index 100% rename from gpsbabel/jeeps/gpsserial.c rename to gpsbabel/jeeps/gpsserial.cc diff --git a/gpsbabel/jeeps/gpsusbcommon.c b/gpsbabel/jeeps/gpsusbcommon.cc similarity index 100% rename from gpsbabel/jeeps/gpsusbcommon.c rename to gpsbabel/jeeps/gpsusbcommon.cc diff --git a/gpsbabel/jeeps/gpsusbread.c b/gpsbabel/jeeps/gpsusbread.cc similarity index 100% rename from gpsbabel/jeeps/gpsusbread.c rename to gpsbabel/jeeps/gpsusbread.cc diff --git a/gpsbabel/jeeps/gpsusbsend.c b/gpsbabel/jeeps/gpsusbsend.cc similarity index 100% rename from gpsbabel/jeeps/gpsusbsend.c rename to gpsbabel/jeeps/gpsusbsend.cc diff --git a/gpsbabel/jeeps/gpsusbstub.c b/gpsbabel/jeeps/gpsusbstub.cc similarity index 100% rename from gpsbabel/jeeps/gpsusbstub.c rename to gpsbabel/jeeps/gpsusbstub.cc diff --git a/gpsbabel/jeeps/gpsusbwin.c b/gpsbabel/jeeps/gpsusbwin.cc similarity index 100% rename from gpsbabel/jeeps/gpsusbwin.c rename to gpsbabel/jeeps/gpsusbwin.cc diff --git a/gpsbabel/jeeps/gpsutil.c b/gpsbabel/jeeps/gpsutil.cc similarity index 100% rename from gpsbabel/jeeps/gpsutil.c rename to gpsbabel/jeeps/gpsutil.cc diff --git a/gpsbabel/jeeps/main.c b/gpsbabel/jeeps/main.cc similarity index 100% rename from gpsbabel/jeeps/main.c rename to gpsbabel/jeeps/main.cc diff --git a/gpsbabel/jogmap.c b/gpsbabel/jogmap.cc similarity index 100% rename from gpsbabel/jogmap.c rename to gpsbabel/jogmap.cc diff --git a/gpsbabel/jtr.c b/gpsbabel/jtr.cc similarity index 100% rename from gpsbabel/jtr.c rename to gpsbabel/jtr.cc diff --git a/gpsbabel/kml.c b/gpsbabel/kml.cc similarity index 99% rename from gpsbabel/kml.c rename to gpsbabel/kml.cc index ded3f6948..057774df8 100644 --- a/gpsbabel/kml.c +++ b/gpsbabel/kml.cc @@ -673,11 +673,11 @@ static void kml_output_timestamp(const waypoint* waypointp) static void kml_output_trkdescription(const route_head* header, computed_trkdata* td) { - char* max_alt_units; + const char* max_alt_units; double max_alt; - char* min_alt_units; + const char* min_alt_units; double min_alt; - char* distance_units; + const char* distance_units; double distance; if (!td || !trackdata) { @@ -704,17 +704,17 @@ void kml_output_trkdescription(const route_head* header, computed_trkdata* td) TD2("Max Alt %.3f %s", max_alt, max_alt_units); } if (td->min_spd) { - char* spd_units; + const char* spd_units; double spd = fmt_speed(td->min_spd, &spd_units); TD2("Min Speed %.1f %s", spd, spd_units); } if (td->max_spd) { - char* spd_units; + const char* spd_units; double spd = fmt_speed(td->max_spd, &spd_units); TD2("Max Speed %.1f %s", spd, spd_units); } if (td->max_spd && td->start && td->end) { - char* spd_units; + const char* spd_units; time_t elapsed = td->end - td->start; double spd = fmt_speed(td->distance_meters / elapsed, &spd_units); if (spd > 1.0) { @@ -836,7 +836,7 @@ static void kml_output_positioning(void) /* Output something interesing when we can for route and trackpoints */ static void kml_output_description(const waypoint* pt) { - char* alt_units; + const char* alt_units; double alt; if (!trackdata) { @@ -864,12 +864,12 @@ static void kml_output_description(const waypoint* pt) TD("Temperature: %.1f", pt->temperature); } if WAYPT_HAS(pt, depth) { - char* depth_units; + const char* depth_units; double depth = fmt_distance(pt->depth, &depth_units); TD2("Depth: %.1f %s", depth, depth_units); } if WAYPT_HAS(pt, speed) { - char* spd_units; + const char* spd_units; double spd = fmt_speed(pt->speed, &spd_units); TD2("Speed: %.1f %s", spd, spd_units); } diff --git a/gpsbabel/lmx.c b/gpsbabel/lmx.cc similarity index 100% rename from gpsbabel/lmx.c rename to gpsbabel/lmx.cc diff --git a/gpsbabel/lowranceusr.c b/gpsbabel/lowranceusr.cc similarity index 100% rename from gpsbabel/lowranceusr.c rename to gpsbabel/lowranceusr.cc diff --git a/gpsbabel/lowranceusr4.c b/gpsbabel/lowranceusr4.cc similarity index 100% rename from gpsbabel/lowranceusr4.c rename to gpsbabel/lowranceusr4.cc diff --git a/gpsbabel/mag_pdb.c b/gpsbabel/mag_pdb.cc similarity index 100% rename from gpsbabel/mag_pdb.c rename to gpsbabel/mag_pdb.cc diff --git a/gpsbabel/maggeo.c b/gpsbabel/maggeo.cc similarity index 100% rename from gpsbabel/maggeo.c rename to gpsbabel/maggeo.cc diff --git a/gpsbabel/magnav.c b/gpsbabel/magnav.cc similarity index 100% rename from gpsbabel/magnav.c rename to gpsbabel/magnav.cc diff --git a/gpsbabel/magproto.c b/gpsbabel/magproto.cc similarity index 100% rename from gpsbabel/magproto.c rename to gpsbabel/magproto.cc diff --git a/gpsbabel/main.c b/gpsbabel/main.cc similarity index 100% rename from gpsbabel/main.c rename to gpsbabel/main.cc diff --git a/gpsbabel/mapasia.c b/gpsbabel/mapasia.cc similarity index 100% rename from gpsbabel/mapasia.c rename to gpsbabel/mapasia.cc diff --git a/gpsbabel/mapopolis.c b/gpsbabel/mapopolis.cc similarity index 100% rename from gpsbabel/mapopolis.c rename to gpsbabel/mapopolis.cc diff --git a/gpsbabel/mapsend.c b/gpsbabel/mapsend.cc similarity index 99% rename from gpsbabel/mapsend.c rename to gpsbabel/mapsend.cc index 407e4694f..480eda80a 100644 --- a/gpsbabel/mapsend.c +++ b/gpsbabel/mapsend.cc @@ -415,7 +415,7 @@ void mapsend_track_hdr(const route_head* trk) * we write mapsend v3.0 tracks as mapsend v2.0 tracks get * tremendously out of whack time/date wise. */ - char* verstring = "30"; + const char* verstring = "30"; queue* elem, *tmp; char* tname; int i; diff --git a/gpsbabel/mapsource.c b/gpsbabel/mapsource.cc similarity index 100% rename from gpsbabel/mapsource.c rename to gpsbabel/mapsource.cc diff --git a/gpsbabel/mkicondoc.c b/gpsbabel/mkicondoc.cc similarity index 100% rename from gpsbabel/mkicondoc.c rename to gpsbabel/mkicondoc.cc diff --git a/gpsbabel/mkshort.c b/gpsbabel/mkshort.cc similarity index 100% rename from gpsbabel/mkshort.c rename to gpsbabel/mkshort.cc diff --git a/gpsbabel/mmo.c b/gpsbabel/mmo.cc similarity index 100% rename from gpsbabel/mmo.c rename to gpsbabel/mmo.cc diff --git a/gpsbabel/msroute.c b/gpsbabel/msroute.cc similarity index 100% rename from gpsbabel/msroute.c rename to gpsbabel/msroute.cc diff --git a/gpsbabel/mtk_locus.c b/gpsbabel/mtk_locus.cc similarity index 95% rename from gpsbabel/mtk_locus.c rename to gpsbabel/mtk_locus.cc index ca9fdaad1..15efd00f1 100644 --- a/gpsbabel/mtk_locus.c +++ b/gpsbabel/mtk_locus.cc @@ -93,7 +93,8 @@ ff_vecs_t mtk_locus_vecs = { #define PMTK_Q_RELEASE "$PMTK605" #define PMTK_DT_RELEASE "$PMTK705" -static void* fd; +static gbfile* ffd; // File access. +static void* sfd; static enum {rm_serial, rm_file} read_mode; static int packetnum; static char line[1000]; @@ -112,8 +113,8 @@ static void process_pmtklox(void); static void process_pmtklog(void); static void process_pmtk001(void); static void process_pmtk705(void); -static void send_command(char* s, char* waitfor); -static int calculate_checksum(char* s, int length); +static void send_command(const char* s, const char* waitfor); +static int calculate_checksum(const char* s, int length); static void dbg(int l, const char* msg, ...); static void @@ -125,17 +126,17 @@ mtk_locus_rd_init(const char* fname) dbg(1, "Input is a serial port\n"); read_mode = rm_serial; - if ((fd = gbser_init(fname)) == NULL) { + if ((sfd = gbser_init(fname)) == NULL) { fatal(MYNAME ": Can't initialise port \"%s\" (%s)\n", fname, strerror(errno)); } set_baudrate(); - gbser_flush(fd); + gbser_flush(sfd); } else { dbg(1, "Input is a normal file\n"); read_mode = rm_file; - if ((fd = gbfopen(fname, "rb", MYNAME)) == NULL) { + if ((ffd = gbfopen(fname, "rb", MYNAME)) == NULL) { fatal(MYNAME ": Can't initialise port \"%s\" (%s)\n", fname, strerror(errno)); } } @@ -147,9 +148,9 @@ static void mtk_locus_rd_deinit(void) { if (read_mode == rm_serial) { - gbser_deinit(fd); + gbser_deinit(sfd); } else { - gbfclose(fd); + gbfclose(ffd); } } @@ -225,7 +226,7 @@ set_baudrate() if (strcmp(opt_baudrate, "0") != 0) { baudrate = atoi(opt_baudrate); - rc = gbser_set_speed(fd, baudrate); + rc = gbser_set_speed(sfd, baudrate); if (rc != gbser_OK) { fatal(MYNAME ": Set baud rate to %i failed (%i)\n", baudrate, rc); } @@ -239,14 +240,14 @@ set_baudrate() fatal(MYNAME ": Autobaud connection failed\n"); } dbg(1, MYNAME ": Probing at %i baud...\n", baudrate); - rc = gbser_set_speed(fd, baudrate); + rc = gbser_set_speed(sfd, baudrate); if (rc != gbser_OK) { dbg(1, "Set speed failed\n"); continue; } - rc = gbser_read_line(fd, line, sizeof(line)-1, TIMEOUT, 0x0A, 0x0D); + rc = gbser_read_line(sfd, line, sizeof(line)-1, TIMEOUT, 0x0A, 0x0D); if (rc != gbser_OK) { dbg(1, "Read test failed\n"); continue; @@ -267,7 +268,7 @@ read_line(void) line[0] = '\0'; if (read_mode == rm_file) { - s = gbfgetstr(fd); + s = gbfgetstr(ffd); if (s == NULL) { dbg(1, "EOF reached\n"); download_complete = 1; @@ -275,7 +276,7 @@ read_line(void) } strncat(line, s, sizeof(line)-1); } else { - rc = gbser_read_line(fd, line, sizeof(line)-1, TIMEOUT, 0x0A, 0x0D); + rc = gbser_read_line(sfd, line, sizeof(line)-1, TIMEOUT, 0x0A, 0x0D); if (rc != gbser_OK) { fatal(MYNAME "Serial read failed: %i\n", rc); } @@ -541,7 +542,7 @@ process_pmtk705() } void -send_command(char* s, char* wait_for) +send_command(const char* s, const char* wait_for) { int rc; time_t starttime; @@ -557,7 +558,7 @@ send_command(char* s, char* wait_for) checksum = calculate_checksum(&s[1], strlen(s)-1); snprintf(cmd, sizeof(cmd)-1, "%s*%02X\r\n", s, checksum); - rc = gbser_print(fd, cmd); + rc = gbser_print(sfd, cmd); if (rc != gbser_OK) { fatal(MYNAME ": Write error (%d)\n", rc); } @@ -588,7 +589,7 @@ send_command(char* s, char* wait_for) } int -calculate_checksum(char* s, int length) +calculate_checksum(const char* s, int length) { int i; int sum; diff --git a/gpsbabel/mtk_logger.c b/gpsbabel/mtk_logger.cc similarity index 100% rename from gpsbabel/mtk_logger.c rename to gpsbabel/mtk_logger.cc diff --git a/gpsbabel/navicache.c b/gpsbabel/navicache.cc similarity index 100% rename from gpsbabel/navicache.c rename to gpsbabel/navicache.cc diff --git a/gpsbabel/naviguide.c b/gpsbabel/naviguide.cc similarity index 100% rename from gpsbabel/naviguide.c rename to gpsbabel/naviguide.cc diff --git a/gpsbabel/navilink.c b/gpsbabel/navilink.cc similarity index 100% rename from gpsbabel/navilink.c rename to gpsbabel/navilink.cc diff --git a/gpsbabel/navitel.c b/gpsbabel/navitel.cc similarity index 100% rename from gpsbabel/navitel.c rename to gpsbabel/navitel.cc diff --git a/gpsbabel/netstumbler.c b/gpsbabel/netstumbler.cc similarity index 100% rename from gpsbabel/netstumbler.c rename to gpsbabel/netstumbler.cc diff --git a/gpsbabel/nmea.c b/gpsbabel/nmea.cc similarity index 100% rename from gpsbabel/nmea.c rename to gpsbabel/nmea.cc diff --git a/gpsbabel/nmn4.c b/gpsbabel/nmn4.cc similarity index 100% rename from gpsbabel/nmn4.c rename to gpsbabel/nmn4.cc diff --git a/gpsbabel/nukedata.c b/gpsbabel/nukedata.cc similarity index 100% rename from gpsbabel/nukedata.c rename to gpsbabel/nukedata.cc diff --git a/gpsbabel/osm.c b/gpsbabel/osm.cc similarity index 100% rename from gpsbabel/osm.c rename to gpsbabel/osm.cc diff --git a/gpsbabel/overlay.c b/gpsbabel/overlay.cc similarity index 99% rename from gpsbabel/overlay.c rename to gpsbabel/overlay.cc index 93999596c..905b20d60 100644 --- a/gpsbabel/overlay.c +++ b/gpsbabel/overlay.cc @@ -121,7 +121,7 @@ static arglist_t ovl_args[] = { }; -static char* Keywords[]= { +static const char* Keywords[]= { "Typ", "Group", "Col", @@ -158,7 +158,7 @@ static char* Keywords[]= { #define KEY_TRANS 14 #define KEY_TRANSBYTE 15 -static int isKeyword(char* str,char** keys) +static int isKeyword(const char* str,const char** keys) { int i; @@ -190,7 +190,7 @@ static struct _group { }* groups; static int groups_cnt; -static void ovl_add_group(int aktgrp,char* akttxt) +static void ovl_add_group(int aktgrp,const char* akttxt) { int i; diff --git a/gpsbabel/ozi.c b/gpsbabel/ozi.cc similarity index 99% rename from gpsbabel/ozi.c rename to gpsbabel/ozi.cc index 0a24d0eb2..449ddf75c 100644 --- a/gpsbabel/ozi.c +++ b/gpsbabel/ozi.cc @@ -200,7 +200,7 @@ static void ozi_openfile(char *fname) { char *c, *cx, *tmpname; - char *ozi_extensions[] = {0, "plt", "wpt", "rte"}; + const char *ozi_extensions[] = {0, "plt", "wpt", "rte"}; char buff[32]; /* if we're doing multi-track output, sequence the filenames like: @@ -249,7 +249,7 @@ ozi_openfile(char *fname) static void ozi_track_hdr(const route_head * rte) { - static char *ozi_trk_header = + static const char *ozi_trk_header = "OziExplorer Track Point File Version 2.1\r\n" "WGS 84\r\n" "Altitude is in %s\r\n" @@ -303,7 +303,7 @@ ozi_track_pr() static void ozi_route_hdr(const route_head * rte) { - static char *ozi_route_header = + static const char *ozi_route_header = "OziExplorer Route File Version 1.0\r\n" "WGS 84\r\n" "Reserved 1\r\n" @@ -949,7 +949,7 @@ ozi_waypt_pr(const waypoint * wpt) static void data_write(void) { - static char *ozi_wpt_header = + static const char *ozi_wpt_header = "OziExplorer Waypoint File Version 1.1\r\n" "WGS 84\r\n" "Reserved 2\r\n" diff --git a/gpsbabel/palmdoc.c b/gpsbabel/palmdoc.cc similarity index 100% rename from gpsbabel/palmdoc.c rename to gpsbabel/palmdoc.cc diff --git a/gpsbabel/parse.c b/gpsbabel/parse.cc similarity index 100% rename from gpsbabel/parse.c rename to gpsbabel/parse.cc diff --git a/gpsbabel/pathaway.c b/gpsbabel/pathaway.cc similarity index 100% rename from gpsbabel/pathaway.c rename to gpsbabel/pathaway.cc diff --git a/gpsbabel/pcx.c b/gpsbabel/pcx.cc similarity index 100% rename from gpsbabel/pcx.c rename to gpsbabel/pcx.cc diff --git a/gpsbabel/pdbfile.c b/gpsbabel/pdbfile.cc similarity index 100% rename from gpsbabel/pdbfile.c rename to gpsbabel/pdbfile.cc diff --git a/gpsbabel/pocketfms_bc.c b/gpsbabel/pocketfms_bc.cc similarity index 100% rename from gpsbabel/pocketfms_bc.c rename to gpsbabel/pocketfms_bc.cc diff --git a/gpsbabel/pocketfms_fp.c b/gpsbabel/pocketfms_fp.cc similarity index 100% rename from gpsbabel/pocketfms_fp.c rename to gpsbabel/pocketfms_fp.cc diff --git a/gpsbabel/pocketfms_wp.c b/gpsbabel/pocketfms_wp.cc similarity index 99% rename from gpsbabel/pocketfms_wp.c rename to gpsbabel/pocketfms_wp.cc index d7c9c3a9d..81fbda3de 100644 --- a/gpsbabel/pocketfms_wp.c +++ b/gpsbabel/pocketfms_wp.cc @@ -106,7 +106,7 @@ enigma_waypt_disp(const waypoint *wpt) if (wpt->shortname) { // The output might have a space or control character. int i, l = strlen(wpt->shortname); - t = xmalloc(l + 1); + t = (char*) xmalloc(l + 1); char *d = t; for (i = 0; i < l; i++) { char s = wpt->shortname[i]; diff --git a/gpsbabel/polygon.c b/gpsbabel/polygon.cc similarity index 100% rename from gpsbabel/polygon.c rename to gpsbabel/polygon.cc diff --git a/gpsbabel/position.c b/gpsbabel/position.cc similarity index 100% rename from gpsbabel/position.c rename to gpsbabel/position.cc diff --git a/gpsbabel/psitrex.c b/gpsbabel/psitrex.cc similarity index 100% rename from gpsbabel/psitrex.c rename to gpsbabel/psitrex.cc diff --git a/gpsbabel/psp.c b/gpsbabel/psp.cc similarity index 100% rename from gpsbabel/psp.c rename to gpsbabel/psp.cc diff --git a/gpsbabel/queue.c b/gpsbabel/queue.cc similarity index 100% rename from gpsbabel/queue.c rename to gpsbabel/queue.cc diff --git a/gpsbabel/quovadis.c b/gpsbabel/quovadis.cc similarity index 100% rename from gpsbabel/quovadis.c rename to gpsbabel/quovadis.cc diff --git a/gpsbabel/radius.c b/gpsbabel/radius.cc similarity index 100% rename from gpsbabel/radius.c rename to gpsbabel/radius.cc diff --git a/gpsbabel/random.c b/gpsbabel/random.cc similarity index 100% rename from gpsbabel/random.c rename to gpsbabel/random.cc diff --git a/gpsbabel/raymarine.c b/gpsbabel/raymarine.cc similarity index 100% rename from gpsbabel/raymarine.c rename to gpsbabel/raymarine.cc diff --git a/gpsbabel/reverse_route.c b/gpsbabel/reverse_route.cc similarity index 100% rename from gpsbabel/reverse_route.c rename to gpsbabel/reverse_route.cc diff --git a/gpsbabel/rgbcolors.c b/gpsbabel/rgbcolors.cc similarity index 100% rename from gpsbabel/rgbcolors.c rename to gpsbabel/rgbcolors.cc diff --git a/gpsbabel/route.c b/gpsbabel/route.cc similarity index 100% rename from gpsbabel/route.c rename to gpsbabel/route.cc diff --git a/gpsbabel/saroute.c b/gpsbabel/saroute.cc similarity index 100% rename from gpsbabel/saroute.c rename to gpsbabel/saroute.cc diff --git a/gpsbabel/sbn.c b/gpsbabel/sbn.cc similarity index 100% rename from gpsbabel/sbn.c rename to gpsbabel/sbn.cc diff --git a/gpsbabel/sbp.c b/gpsbabel/sbp.cc similarity index 100% rename from gpsbabel/sbp.c rename to gpsbabel/sbp.cc diff --git a/gpsbabel/session.c b/gpsbabel/session.cc similarity index 100% rename from gpsbabel/session.c rename to gpsbabel/session.cc diff --git a/gpsbabel/shape.c b/gpsbabel/shape.cc similarity index 99% rename from gpsbabel/shape.c rename to gpsbabel/shape.cc index c394b7ace..1e233d074 100644 --- a/gpsbabel/shape.c +++ b/gpsbabel/shape.cc @@ -112,7 +112,7 @@ void my_read(void) { int npts; - char *etype = "unknown"; + const char *etype = "unknown"; SHPGetInfo(ihandle, &npts, NULL, NULL, NULL); diff --git a/gpsbabel/skyforce.c b/gpsbabel/skyforce.cc similarity index 100% rename from gpsbabel/skyforce.c rename to gpsbabel/skyforce.cc diff --git a/gpsbabel/skytraq.c b/gpsbabel/skytraq.cc similarity index 100% rename from gpsbabel/skytraq.c rename to gpsbabel/skytraq.cc diff --git a/gpsbabel/smplrout.c b/gpsbabel/smplrout.cc similarity index 100% rename from gpsbabel/smplrout.c rename to gpsbabel/smplrout.cc diff --git a/gpsbabel/sort.c b/gpsbabel/sort.cc similarity index 100% rename from gpsbabel/sort.c rename to gpsbabel/sort.cc diff --git a/gpsbabel/stackfilter.c b/gpsbabel/stackfilter.cc similarity index 100% rename from gpsbabel/stackfilter.c rename to gpsbabel/stackfilter.cc diff --git a/gpsbabel/stmsdf.c b/gpsbabel/stmsdf.cc similarity index 99% rename from gpsbabel/stmsdf.c rename to gpsbabel/stmsdf.cc index b80feddff..3e69a41ab 100644 --- a/gpsbabel/stmsdf.c +++ b/gpsbabel/stmsdf.cc @@ -111,7 +111,7 @@ parse_header(char *line) { char *str; char *key = NULL; - char *prod = NULL; + const char *prod = NULL; int column = -1; while ((str = csv_lineparse(line, "=", "", lineno))) { @@ -602,13 +602,13 @@ track_disp_wpt_cb(const waypoint *wpt) } if (flag == 1) { - char *name = wpt->shortname; + const char *name = wpt->shortname; if (name == NULL) { name = "Log paused"; } gbfprintf(fout, "\"MP\",\"%s\"", name); } else if (flag == 2) { - char *name = wpt->shortname; + const char *name = wpt->shortname; if (name == NULL) { name = "Log continued"; } diff --git a/gpsbabel/stmwpp.c b/gpsbabel/stmwpp.cc similarity index 100% rename from gpsbabel/stmwpp.c rename to gpsbabel/stmwpp.cc diff --git a/gpsbabel/subrip.c b/gpsbabel/subrip.cc similarity index 100% rename from gpsbabel/subrip.c rename to gpsbabel/subrip.cc diff --git a/gpsbabel/swapdata.c b/gpsbabel/swapdata.cc similarity index 100% rename from gpsbabel/swapdata.c rename to gpsbabel/swapdata.cc diff --git a/gpsbabel/tef_xml.c b/gpsbabel/tef_xml.cc similarity index 100% rename from gpsbabel/tef_xml.c rename to gpsbabel/tef_xml.cc diff --git a/gpsbabel/teletype.c b/gpsbabel/teletype.cc similarity index 100% rename from gpsbabel/teletype.c rename to gpsbabel/teletype.cc diff --git a/gpsbabel/text.c b/gpsbabel/text.cc similarity index 100% rename from gpsbabel/text.c rename to gpsbabel/text.cc diff --git a/gpsbabel/tiger.c b/gpsbabel/tiger.cc similarity index 100% rename from gpsbabel/tiger.c rename to gpsbabel/tiger.cc diff --git a/gpsbabel/tmpro.c b/gpsbabel/tmpro.cc similarity index 100% rename from gpsbabel/tmpro.c rename to gpsbabel/tmpro.cc diff --git a/gpsbabel/tomtom.c b/gpsbabel/tomtom.cc similarity index 100% rename from gpsbabel/tomtom.c rename to gpsbabel/tomtom.cc diff --git a/gpsbabel/tpg.c b/gpsbabel/tpg.cc similarity index 100% rename from gpsbabel/tpg.c rename to gpsbabel/tpg.cc diff --git a/gpsbabel/tpo.c b/gpsbabel/tpo.cc similarity index 100% rename from gpsbabel/tpo.c rename to gpsbabel/tpo.cc diff --git a/gpsbabel/trackfilter.c b/gpsbabel/trackfilter.cc similarity index 100% rename from gpsbabel/trackfilter.c rename to gpsbabel/trackfilter.cc diff --git a/gpsbabel/transform.c b/gpsbabel/transform.cc similarity index 100% rename from gpsbabel/transform.c rename to gpsbabel/transform.cc diff --git a/gpsbabel/unicsv.c b/gpsbabel/unicsv.cc similarity index 100% rename from gpsbabel/unicsv.c rename to gpsbabel/unicsv.cc diff --git a/gpsbabel/units.c b/gpsbabel/units.cc similarity index 93% rename from gpsbabel/units.c rename to gpsbabel/units.cc index 434407f57..0bd1312a0 100644 --- a/gpsbabel/units.c +++ b/gpsbabel/units.cc @@ -39,7 +39,7 @@ fmt_setunits(fmt_units u) } double -fmt_distance(const double distance_meters, char **tag) +fmt_distance(const double distance_meters, const char **tag) { double d; @@ -77,7 +77,7 @@ fmt_distance(const double distance_meters, char **tag) } double -fmt_altitude(const double distance_meters, char **tag) +fmt_altitude(const double distance_meters, const char **tag) { double d; @@ -105,7 +105,7 @@ fmt_altitude(const double distance_meters, char **tag) } double -fmt_speed(const double distance_meters_sec, char **tag) +fmt_speed(const double distance_meters_sec, const char **tag) { double d; diff --git a/gpsbabel/util.c b/gpsbabel/util.cc similarity index 100% rename from gpsbabel/util.c rename to gpsbabel/util.cc diff --git a/gpsbabel/util_crc.c b/gpsbabel/util_crc.cc similarity index 100% rename from gpsbabel/util_crc.c rename to gpsbabel/util_crc.cc diff --git a/gpsbabel/uuid.c b/gpsbabel/uuid.cc similarity index 100% rename from gpsbabel/uuid.c rename to gpsbabel/uuid.cc diff --git a/gpsbabel/v900.c b/gpsbabel/v900.cc similarity index 100% rename from gpsbabel/v900.c rename to gpsbabel/v900.cc diff --git a/gpsbabel/vcf.c b/gpsbabel/vcf.cc similarity index 100% rename from gpsbabel/vcf.c rename to gpsbabel/vcf.cc diff --git a/gpsbabel/vecs.c b/gpsbabel/vecs.cc similarity index 99% rename from gpsbabel/vecs.c rename to gpsbabel/vecs.cc index f765778d6..c0617e4d5 100644 --- a/gpsbabel/vecs.c +++ b/gpsbabel/vecs.cc @@ -1569,7 +1569,7 @@ disp_vec(const char *vecname) static void disp_v1(ff_type t) { - char *tstring; + const char *tstring; switch (t) { case ff_type_file: diff --git a/gpsbabel/vidaone.c b/gpsbabel/vidaone.cc similarity index 100% rename from gpsbabel/vidaone.c rename to gpsbabel/vidaone.cc diff --git a/gpsbabel/vitosmt.c b/gpsbabel/vitosmt.cc similarity index 100% rename from gpsbabel/vitosmt.c rename to gpsbabel/vitosmt.cc diff --git a/gpsbabel/vitovtt.c b/gpsbabel/vitovtt.cc similarity index 100% rename from gpsbabel/vitovtt.c rename to gpsbabel/vitovtt.cc diff --git a/gpsbabel/vmem.c b/gpsbabel/vmem.cc similarity index 100% rename from gpsbabel/vmem.c rename to gpsbabel/vmem.cc diff --git a/gpsbabel/vpl.c b/gpsbabel/vpl.cc similarity index 100% rename from gpsbabel/vpl.c rename to gpsbabel/vpl.cc diff --git a/gpsbabel/waypt.c b/gpsbabel/waypt.cc similarity index 100% rename from gpsbabel/waypt.c rename to gpsbabel/waypt.cc diff --git a/gpsbabel/wbt-200.c b/gpsbabel/wbt-200.cc similarity index 99% rename from gpsbabel/wbt-200.c rename to gpsbabel/wbt-200.cc index 763bbde88..1f70d51e1 100644 --- a/gpsbabel/wbt-200.c +++ b/gpsbabel/wbt-200.cc @@ -872,7 +872,7 @@ static int wbt201_read_chunk(struct read_state *st, unsigned pos, unsigned limit char line_buf[100]; unsigned long cs; char *lp, *op; - static char *cs_prefix = "@AL,CS,"; + static const char *cs_prefix = "@AL,CS,"; unsigned want = limit - pos; if (want > WBT201CHUNK) { diff --git a/gpsbabel/wfff_xml.c b/gpsbabel/wfff_xml.cc similarity index 100% rename from gpsbabel/wfff_xml.c rename to gpsbabel/wfff_xml.cc diff --git a/gpsbabel/wintec_tes.c b/gpsbabel/wintec_tes.cc similarity index 100% rename from gpsbabel/wintec_tes.c rename to gpsbabel/wintec_tes.cc diff --git a/gpsbabel/xcsv.c b/gpsbabel/xcsv.cc similarity index 100% rename from gpsbabel/xcsv.c rename to gpsbabel/xcsv.cc diff --git a/gpsbabel/xhtmlent.c b/gpsbabel/xhtmlent.cc similarity index 100% rename from gpsbabel/xhtmlent.c rename to gpsbabel/xhtmlent.cc diff --git a/gpsbabel/xmlgeneric.c b/gpsbabel/xmlgeneric.cc similarity index 100% rename from gpsbabel/xmlgeneric.c rename to gpsbabel/xmlgeneric.cc diff --git a/gpsbabel/xmltag.c b/gpsbabel/xmltag.cc similarity index 100% rename from gpsbabel/xmltag.c rename to gpsbabel/xmltag.cc diff --git a/gpsbabel/xol.c b/gpsbabel/xol.cc similarity index 100% rename from gpsbabel/xol.c rename to gpsbabel/xol.cc diff --git a/gpsbabel/yahoo.c b/gpsbabel/yahoo.cc similarity index 100% rename from gpsbabel/yahoo.c rename to gpsbabel/yahoo.cc -- 2.30.2